- use %service

[packages/apache1-mod_mp3.git] / apache1-mod_mp3.spec

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index 95c42691b57c66e5679109ab22dfed6cb1f74eaa..e476a3f193c382c285b5b083effea991f97ac623 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -16,11 +16,12 @@ URL:                http://media.tangent.org/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: libghttp-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       %{apxs}
 Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0
 Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Obsoletes:     apache-mod_mp3 <= 0.40
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -63,15 +64,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 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 -- %{name} < 0.40-2.1
@@ -86,9 +83,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)