SPECS: apache-mod_auth_pam.spec - use %service macro - killed bogu...

[glen]

Author: glen                         Date: Sat Jan 14 18:22:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service macro
- killed bogus comment

---- Files affected:
SPECS:
   apache-mod_auth_pam.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth_pam.spec
diff -u SPECS/apache-mod_auth_pam.spec:1.39 SPECS/apache-mod_auth_pam.spec:1.40
--- SPECS/apache-mod_auth_pam.spec:1.39	Sat Jan 14 18:09:36 2006
+++ SPECS/apache-mod_auth_pam.spec	Sat Jan 14 19:22:19 2006
@@ -18,8 +18,9 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
 BuildRequires:	pam-devel
-Requires:	apache(modules-api) = %apache_modules_api
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache >= 2.0
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -59,28 +60,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %triggerpostun -- %{name} < 1.1
 if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
-        echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
-        cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
-        echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
-        sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
-
-        # we have to do part of %post here to have ircd working after upgrade from 2.10.x to 2.11.x
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
+	cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
+	echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
+	sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+
+	%service -q httpd restart
 fi
 
 # This shouldn't be here, but someone has used version 2.0 in spec when real
@@ -88,15 +82,12 @@
 # clean upgrade. This trigger may be a problem when real 2.0 will be out.
 %triggerpostun -- %{name} >= 2.0
 if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
-        echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
-        cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
-        echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
-        sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
-
-        # we have to do part of %post here to have ircd working after upgrade from 2.10.x to 2.11.x
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
+	cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
+	echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
+	sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+
+	%service -q httpd restart
 fi
 
 %files
@@ -112,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/01/14 18:22:19  glen
+- use %service macro
+- killed bogus comment
+
 Revision 1.39  2006/01/14 17:09:36  hawk
 - updated to 1.1.1
 - removed missing_constant.patch (fixed in sources)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_pam.spec?r1=1.39&r2=1.40&f=u