SPECS: apache1.spec - use %service

glen glen at pld-linux.org
Tue Feb 7 21:10:03 CET 2006


Author: glen                         Date: Tue Feb  7 20:10:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   apache1.spec (1.130 -> 1.131) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.130 SPECS/apache1.spec:1.131
--- SPECS/apache1.spec:1.130	Tue Feb  7 19:38:32 2006
+++ SPECS/apache1.spec	Tue Feb  7 21:09:57 2006
@@ -98,7 +98,7 @@
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.247
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	mm
 Requires:	rc-scripts
 %if %{without minimal}
@@ -1450,9 +1450,7 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache stop 1>&2
-	fi
+	%service apache stop
 	/sbin/chkconfig --del apache
 fi
 
@@ -2410,6 +2408,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2006/02/07 20:09:57  glen
+- use %service
+
 Revision 1.130  2006/02/07 18:38:32  glen
 - CVE-2005-3352, rel 8; STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.130&r2=1.131&f=u



More information about the pld-cvs-commit mailing list