SPECS: squid.spec - use %service; rel 7, STBR

[glen]

Author: glen                         Date: Sun Jan 29 19:58:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service; rel 7, STBR

---- Files affected:
SPECS:
   squid.spec (1.237 -> 1.238) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.237 SPECS/squid.spec:1.238
--- SPECS/squid.spec:1.237	Tue Jan 17 16:44:40 2006
+++ SPECS/squid.spec	Sun Jan 29 20:58:18 2006
@@ -12,7 +12,7 @@
 Summary(zh_CN):	SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:		squid
 Version:	2.5.STABLE12
-Release:	6
+Release:	7
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -58,7 +58,7 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Requires(post):	/bin/hostname
@@ -571,22 +571,16 @@
 	echo visible_hostname $hostname >> /etc/squid/squid.conf
 fi
 
+/sbin/chkconfig --add squid
 if [ "$1" = "1" ]; then
-	/sbin/chkconfig --add squid
 	/etc/rc.d/init.d/squid init >&2
-	echo "Run \"/etc/rc.d/init.d/squid start\" to start squid." >&2
-else
-	if [ -f /var/lock/subsys/squid ]; then
-		/etc/rc.d/init.d/squid restart >&2
-	fi
 fi
+%service squid restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/squid ]; then
-		/etc/rc.d/init.d/squid stop >&2
-	fi
 	/sbin/chkconfig --del squid
+	%service squid stop
 
 	# nuke squid cache if uninstalling
 	rm -rf /var/cache/squid/??
@@ -766,6 +760,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.238  2006/01/29 19:58:18  glen
+- use %service; rel 7, STBR
+
 Revision 1.237  2006/01/17 15:44:40  baggins
 - release 6
 - BR openldap 2.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.237&r2=1.238&f=u