- use %service

Changed files:
    apache1-mod_suid.spec -> 1.13

diff --git a/apache1-mod_suid.spec b/apache1-mod_suid.spec
index 8ab1a0c43ed960452a96d59b565695e3365ec9c9..8d08bca47f7a1410439115293e230124a3e94f86 100644 (file)
--- a/apache1-mod_suid.spec
+++ b/apache1-mod_suid.spec
@@ -12,10 +12,11 @@ Source0:    http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{mod_name}-%{ve
 URL:           http://www.jdimedia.nl/igmar/mod_suid/
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
 URL:           http://www.jdimedia.nl/igmar/mod_suid/
 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
 BuildRequires: zlib-devel
 Requires(triggerpostun):       %{apxs}
 Requires:      apache1 >= 1.3.33-2

-Obsoletes:     apache-mod_%{mod_name} <= 1.1
+Obsoletes:     apache-mod_suid <= 1.1

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)


@@ -46,15 +47,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 rm -rf $RPM_BUILD_ROOT
 
 %post
 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
 
 %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.1-1.1
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.1-1.1