- use %service macro

- killed bogus comment

Changed files:
    apache-mod_auth_pam.spec -> 1.40

diff --git a/apache-mod_auth_pam.spec b/apache-mod_auth_pam.spec
index ce68c4ee47fa9747afd1b453f9f8ab4ab729dcc7..1bada40181dd11582b13439e443c4d6a6650a304 100644 (file)
--- a/apache-mod_auth_pam.spec
+++ b/apache-mod_auth_pam.spec
@@ -17,8 +17,9 @@ URL:          http://pam.sourceforge.net/mod_auth_pam/
 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)
@@ -58,28 +59,21 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 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
@@ -87,15 +81,12 @@ fi
 # 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