SPECS: apache-mod_roaming.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 00:46:01 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_roaming.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_roaming.spec
diff -u SPECS/apache-mod_roaming.spec:1.23 SPECS/apache-mod_roaming.spec:1.24
--- SPECS/apache-mod_roaming.spec:1.23	Wed Nov 16 19:35:37 2005
+++ SPECS/apache-mod_roaming.spec	Tue Dec 27 01:45:56 2005
@@ -24,13 +24,11 @@
 URL:		http://www.klomp.org/mod_roaming/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.32
-Requires(post,preun):	%{apxs}
-Requires(post,preun):	grep
-Requires(preun):	fileutils
-Requires:	apache >= 2.0.32
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 With mod_roaming you can use your Apache web server as a Netscape
@@ -117,30 +115,21 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,%{_var}/lib/mod_roaming}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_var}/lib/mod_roaming}
 
 install .libs/mod_roaming.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_roaming.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_%{mod_name}.conf" /etc/httpd/httpd.conf; then
-	echo "Include /etc/httpd/mod_%{mod_name}.conf" >> /etc/httpd/httpd.conf
-fi
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-	umask 027
-	grep -v "^Include.*mod_%{mod_name}.conf" /etc/httpd/httpd.conf > \
-		/etc/httpd/httpd.conf.tmp
-	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
@@ -149,9 +138,9 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES INSTALL LICENSE README
-%attr(755,root,root) %{_pkglibdir}/mod_roaming.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %attr(660,root,http) %dir %{_var}/lib/mod_roaming
-%config(noreplace) %{_sysconfdir}/httpd/mod_roaming.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -159,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/12/27 00:45:56  glen
+- unified
+
 Revision 1.23  2005/11/16 18:35:37  qboosh
 - fixed build
 
@@ -187,7 +179,7 @@
 - umask in scripts, other fixes/cosmetics where needed
 
 Revision 1.14  2002/12/07 14:32:49  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.13  2002/08/13 15:06:22  grzegorz
 - sed -e "s/%{_sbindir}\/apxs -e/\%{apxs} -e/"
@@ -197,10 +189,10 @@
 - finished.
 
 Revision 1.11  2002/04/25 15:46:36  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.10  2002/03/27 12:05:08  roman
-s/BSD type/BSD-like in License
+- s/BSD type/BSD-like in License
 
 Revision 1.9  2002/02/22 23:28:41  kloczek
 - removed all Group fields translations (our rpm now can handle translating
@@ -210,9 +202,9 @@
 - release 6
 
 Revision 1.7  2002/02/17 19:01:43  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 
 Revision 1.6  2002/02/17 05:02:07  kloczek
 - release 5.
@@ -222,13 +214,13 @@
 - adapterized
 
 Revision 1.4  2002/01/18 02:12:21  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.3  2001/10/31 11:57:22  qboosh
-- some fixes in %%install/%%files, pl translations
+- some fixes in %install/%files, pl translations
 
 Revision 1.2  2001/07/26 02:39:21  agaran
-just adapterized + fixed group field
+- just adapterized + fixed group field
 
 * Fri May 25 2001 Nalin Dahyabhai <nalin at redhat.com>
 - rebuild in new environment
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_roaming.spec?r1=1.23&r2=1.24&f=u