SPECS: nginx.spec - %service cleanup (it already includes lockfile...

[glen]

Author: glen                         Date: Sat Dec  1 18:28:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %service cleanup (it already includes lockfile check)

---- Files affected:
SPECS:
   nginx.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.70 SPECS/nginx.spec:1.71
--- SPECS/nginx.spec:1.70	Sat Dec  1 19:25:25 2007
+++ SPECS/nginx.spec	Sat Dec  1 19:28:17 2007
@@ -446,11 +446,7 @@
 done
 if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add %{name}-standard
-	if [ -f /var/lock/subsys/%{name}-standard ]; then
-		%service %{name}-standard restart 1>&2
-	else
-		echo "Run \"/etc/rc.d/init.d/nginx-standard start\" to start nginx daemon."
-	fi
+	%service %{name}-standard restart
 fi
 echo "Notice: deamon is now using \"/etc/nginx/nginx-standard.conf\" file"
 
@@ -464,11 +460,7 @@
 done
 if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add %{name}-light
-	if [ -f /var/lock/subsys/%{name}-light ]; then
-		%service %{name}-light restart 1>&2
-	else
-		echo "Run \"/etc/rc.d/init.d/nginx-light start\" to start nginx daemon."
-	fi
+	%service %{name}-light restart
 fi
 echo "Notice: deamon is now using \"/etc/nginx/nginx-light.conf\" file"
 
@@ -482,11 +474,7 @@
 done
 if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add %{name}-perl
-	if [ -f /var/lock/subsys/%{name}-perl ]; then
-		%service %{name}-perl restart 1>&2
-	else
-		echo "Run \"/etc/rc.d/init.d/nginx-perl start\" to start nginx daemon."
-	fi
+	%service %{name}-perl restart
 fi
 echo "Notice: deamon is now using \"/etc/nginx/nginx-perl.conf\" file"
 
@@ -500,43 +488,31 @@
 done
 if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add %{name}-mail
-	if [ -f /var/lock/subsys/%{name}-mail ]; then
-		%service %{name}-mail restart 1>&2
-	else
-		echo "Run \"/etc/rc.d/init.d/nginx-mail start\" to start nginx daemon."
-	fi
+	%service %{name}-mail restart
 fi
 echo "Notice: deamon is now using \"/etc/nginx/nginx-mail.conf\" file"
 
 %preun standard
 if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/%{name}-standard ]; then
-		%service -q %{name}-standard stop
-	fi
+	%service %{name}-standard stop
 	/sbin/chkconfig --del %{name}-standard
 fi
 
 %preun light
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name}-light ]; then
-		%service -q %{name}-light stop
-	fi
+	%service %{name}-light stop
 	/sbin/chkconfig --del %{name}-light
 fi
 
 %preun perl
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name}-perl ]; then
-		%service -q %{name}-perl stop
-	fi
+	%service %{name}-perl stop
 	/sbin/chkconfig --del %{name}-perl
 fi
 
 %preun mail
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name}-mail ]; then
-		%service -q %{name}-mail stop
-	fi
+	%service %{name}-mail stop
 	/sbin/chkconfig --del %{name}-mail
 fi
 
@@ -621,6 +597,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2007-12-01 18:28:17  glen
+- %service cleanup (it already includes lockfile check)
+
 Revision 1.70  2007-12-01 18:25:25  glen
 - spelling
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nginx.spec?r1=1.70&r2=1.71&f=u