rpms/cups/devel cups.init,1.10,1.11 cups.spec,1.328,1.329

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25814

Modified Files:
	cups.init cups.spec 
Log Message:
* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-8
- Initscript fixes (bug #237955).
- Resolves: rhbz#237955



Index: cups.init
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cups.init	1 Jun 2006 12:58:58 -0000	1.10
+++ cups.init	26 Apr 2007 12:50:08 -0000	1.11
@@ -32,13 +32,7 @@
 # Linux
 
 # Source function library.
-if [ -f /etc/init.d/functions ] ; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-	. /etc/rc.d/init.d/functions
-else
-	exit 0
-fi
+. /etc/init.d/functions
 
 DAEMON=cupsd
 
@@ -90,6 +84,7 @@
 	;;
 	status)
 		status $DAEMON
+		RETVAL=$?
 	;;
 	restartlog)
 		stop
@@ -99,7 +94,7 @@
 	*)
 
 	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-	exit 1
+	exit 3
 esac
 
 exit $RETVAL


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- cups.spec	25 Apr 2007 17:10:11 -0000	1.328
+++ cups.spec	26 Apr 2007 12:50:08 -0000	1.329
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -442,6 +442,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-8
+- Initscript fixes (bug #237955).
+
 * Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
 - Until bug #236736 is fixed, work around the kernel usblp driver's
   quirks so that we can detect paper-out conditions.