rpms/cups/devel cups.init, 1.6, 1.7 cups.spec, 1.175, 1.176 cups-1.1.17-ppdsdat.patch, 1.4, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.init cups.spec 
Removed Files:
	cups-1.1.17-ppdsdat.patch 
Log Message:
No longer need --ppdsdat option.


Index: cups.init
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cups.init	9 Sep 2004 04:05:22 -0000	1.6
+++ cups.init	26 Apr 2006 12:55:15 -0000	1.7
@@ -99,12 +99,6 @@
 		killproc $DAEMON -HUP
 		RETVAL=$?
 		echo
-		if [ $RETVAL -ne 0 ]
-		then
-			# Rebuild ppds.dat file if the daemon wasn't
-			# there to do it.
-			$DAEMON --ppdsdat
-		fi
 	;;
 	status)
 		status $DAEMON


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- cups.spec	26 Apr 2006 12:51:40 -0000	1.175
+++ cups.spec	26 Apr 2006 12:55:15 -0000	1.176
@@ -29,7 +29,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch10: cups-1.1.17-ppdsdat.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch16: cups-pie.patch
@@ -115,7 +114,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch10 -p1 -b .ppdsdat
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %if %build_as_pie
@@ -385,7 +383,7 @@
 
 %changelog
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
-- No longer need backend, rcp patches.
+- No longer need backend, rcp, ppdsdat patches.
 - Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>


--- cups-1.1.17-ppdsdat.patch DELETED ---