- use %service

Changed files:
    apache1-mod_auth_checkpasswd.spec -> 1.22

diff --git a/apache1-mod_auth_checkpasswd.spec b/apache1-mod_auth_checkpasswd.spec
index 85928e9a71011d5f3be068ad72a61425c0ec2f5b..7436fb6cb3504316b4fb965f0b16218a43c79f7c 100644 (file)
--- a/apache1-mod_auth_checkpasswd.spec
+++ b/apache1-mod_auth_checkpasswd.spec
@@ -12,9 +12,10 @@ Source0:     mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-aplog.patch
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       %{apxs}
 Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Obsoletes:     apache-mod_auth_checkpasswd <= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -52,15 +53,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.0-1.1