From 0f3351387984453d1e5c07d1624b8eaf50d529b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 14 Apr 2006 16:50:13 +0000 Subject: [PATCH] - use %service Changed files: apache1-mod_gzip.spec -> 1.38 --- apache1-mod_gzip.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/apache1-mod_gzip.spec b/apache1-mod_gzip.spec index c921abe..685ecb9 100644 --- a/apache1-mod_gzip.spec +++ b/apache1-mod_gzip.spec @@ -16,12 +16,13 @@ Patch1: %{name}-security.patch URL: http://www.schroepl.net/projekte/mod_gzip/ BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: zlib-devel 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_gzip <= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -58,15 +59,11 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} 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} < 1.3.26.1a-1.1 @@ -81,9 +78,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) -- 2.44.0