rpms/foomatic/devel foomatic-cleanup.patch, NONE, 1.1 foomatic.spec, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14006

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-cleanup.patch 
Log Message:
* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-32
- Fix foomatic-cleanupdrivers.

foomatic-cleanup.patch:
 foomatic-cleanupdrivers.in |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE foomatic-cleanup.patch ---
--- foomatic-db-engine-3.0-20060117/foomatic-cleanupdrivers.in.cleanup	2006-01-17 14:02:26.000000000 +0000
+++ foomatic-db-engine-3.0-20060117/foomatic-cleanupdrivers.in	2006-01-17 14:02:47.000000000 +0000
@@ -28,6 +28,7 @@
     my @driverentryfield = <DRIVERENTRY>;
     close DRIVERENTRY;
     my $driverentry = join ('', @driverentryfield);
+    next unless $driverentry;
     if (($driverentry =~ m!<prototype>\s*</prototype>!sg) ||
 	($driverentry =~ m!<prototype\s*/\s*>!sg) ||
 	($driverentry !~ m!<prototype[>/\s]!sg)) {


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- foomatic.spec	17 Jan 2006 13:50:45 -0000	1.128
+++ foomatic.spec	17 Jan 2006 14:08:51 -0000	1.129
@@ -57,6 +57,9 @@
 # Handle PPDs with default option values of '0'.
 Patch17: foomatic-default0.patch
 
+# Fix foomatic-cleanupdrivers.
+Patch18: foomatic-cleanup.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -109,6 +112,7 @@
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
 %patch17 -p1 -b .default0
+%patch18 -p1 -b .cleanup
 ./make_configure
 popd
 
@@ -272,6 +276,7 @@
 
 %changelog
 * Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-32
+- Fix foomatic-cleanupdrivers.
 - Updated db-engine to 3.0-20060117.
 - Handle PPDs with default option values of '0'.