- use %service

Changed files:
    apache1-mod_cvs.spec -> 1.29

diff --git a/apache1-mod_cvs.spec b/apache1-mod_cvs.spec
index a0ec29981ccd9cb557bb3b1e8bb5a3387e3c1196..51071eaa55f9bdd49d8b1289713c3a32a8e0190f 100644 (file)
--- a/apache1-mod_cvs.spec
+++ b/apache1-mod_cvs.spec
@@ -14,10 +14,11 @@ Source0:    ftp://ftp.sub.nu/pub/mod_cvs/mod_%{mod_name}-%{version}.tar.gz
 URL:           http://www.sub.nu/mod_cvs/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
 Requires(triggerpostun):       %{apxs}
 Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Obsoletes:     apache-mod_cvs <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -48,15 +49,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} < 0.5-1.1