- use %service

Changed files:
    apache1-mod_jk.spec -> 1.10

diff --git a/apache1-mod_jk.spec b/apache1-mod_jk.spec
index 7fb009ac0ad7ba6e195e0a222e0790d0db3a1033..65494b6c3e7e86cf531c6e46d575ff6c509467f4 100644 (file)
--- a/apache1-mod_jk.spec
+++ b/apache1-mod_jk.spec
@@ -18,9 +18,10 @@ BuildRequires:       autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache1 >= 1.3.33-2
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     jakarta-tomcat-connectors-jk
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 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
 
 %files