rpms/cups/devel cups.init,1.13,1.14 cups.spec,1.383,1.384

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5202

Modified Files:
	cups.init cups.spec 
Log Message:
* Fri Feb  1 2008 Tim Waugh <twaugh at redhat.com>
- Updated initscript for LSB exit codes and actions (bug #246897).



Index: cups.init
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cups.init	20 Jul 2007 14:44:12 -0000	1.13
+++ cups.init	1 Feb 2008 13:33:44 -0000	1.14
@@ -46,7 +46,7 @@
         RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/cups
-	return $RETVAL
+	return 0
 }
 
 stop () {
@@ -56,6 +56,7 @@
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/cups
+	return 0
 }
 
 restart() {
@@ -73,7 +74,7 @@
 	restart)
 		restart
 	;;
-	condrestart)
+	condrestart|try-restart)
 		[ -f /var/lock/subsys/cups ] && restart || :
 	;;	
 	reload)
@@ -82,6 +83,13 @@
 		RETVAL=$?
 		echo
 	;;
+	force-reload)
+		echo -n $"Reloading $prog: "
+		if ! killproc $DAEMON -HUP; then
+			restart
+		fi
+		echo
+	;;
 	status)
 		status $DAEMON
 		RETVAL=$?


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- cups.spec	24 Jan 2008 14:14:03 -0000	1.383
+++ cups.spec	1 Feb 2008 13:33:44 -0000	1.384
@@ -452,6 +452,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Feb  1 2008 Tim Waugh <twaugh at redhat.com>
+- Updated initscript for LSB exit codes and actions (bug #246897).
+
 * Thu Jan 24 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-3
 - Build requires autoconf.