- use %service

Changed files:
    apache1-mod_watch.spec -> 1.26

diff --git a/apache1-mod_watch.spec b/apache1-mod_watch.spec
index 0cda5e355b00045b500c8e71b251377d35e8962a..5c7f325a644bafa8837494497057b545aa31ed36 100644 (file)
--- a/apache1-mod_watch.spec
+++ b/apache1-mod_watch.spec
@@ -21,8 +21,9 @@ URL:          http://www.snert.com/Software/mod_watch/
 BuildRequires: %{apxs}
 #{?with_ipv6:BuildRequires:    apache1(ipv6)-devel}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= 3.18
+Obsoletes:     apache-mod_watch <= 3.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -68,17 +69,11 @@ sed -e 's/<!--#/<!--/g' index.shtml > mod_watch.html
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
-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 -- %{name} < 3.18-1.1
@@ -93,9 +88,7 @@ else
                s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
        ' /etc/apache/apache.conf
 fi
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %files
 %defattr(644,root,root,755)