rpms/foomatic/devel foomatic-default0.patch, NONE, 1.1 foomatic.spec, 1.126, 1.127

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-default0.patch 
Log Message:
* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-32
- Handle PPDs with default option values of '0'.


foomatic-default0.patch:
 DB.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE foomatic-default0.patch ---
--- foomatic-db-engine-3.0-20051209/lib/Foomatic/DB.pm.default0	2006-01-17 13:21:22.000000000 +0000
+++ foomatic-db-engine-3.0-20051209/lib/Foomatic/DB.pm	2006-01-17 13:22:17.000000000 +0000
@@ -1025,7 +1025,7 @@
 		$dat->{'args_byname'}{$currentargument}{'vals_byname'}{$setting}{'comment'} = $translation;
 		# Make sure that this argument has a default setting, even
 		# if none is defined in this PPD file
-		if (!$dat->{'args_byname'}{$currentargument}{'default'}) {
+		if ($dat->{'args_byname'}{$currentargument}{'default'} eq "") {
 		    $dat->{'args_byname'}{$currentargument}{'default'} = $setting;
 		}
 	    }


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- foomatic.spec	16 Jan 2006 14:12:52 -0000	1.126
+++ foomatic.spec	17 Jan 2006 13:24:25 -0000	1.127
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 31
+Release: 32
 License:	GPL
 Group: System Environment/Libraries
 
@@ -54,6 +54,9 @@
 # Fix tag mismatch in db.
 Patch16: foomatic-badxml.patch
 
+# Handle PPDs with default option values of '0'.
+Patch17: foomatic-default0.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -105,6 +108,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch17 -p1 -b .default0
 ./make_configure
 popd
 
@@ -267,6 +271,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-32
+- Handle PPDs with default option values of '0'.
+
 * Mon Jan 16 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-31
 - Fix tag mismatch in db.
 - Updated db to 3.0-20060116.