rpms/foomatic/F-11 foomatic-filters-int-options.patch, NONE, 1.1 foomatic.spec, 1.227, 1.228

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30317

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-filters-int-options.patch 
Log Message:
* Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 4.0.3-5
- Fix for handling integer options (bug #531278).


foomatic-filters-int-options.patch:
 options.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-filters-int-options.patch ---
diff -up foomatic-filters-4.0.3/options.c.int-options foomatic-filters-4.0.3/options.c
--- foomatic-filters-4.0.3/options.c.int-options	2009-08-19 19:08:41.000000000 +0100
+++ foomatic-filters-4.0.3/options.c	2010-01-19 16:43:09.343981005 +0000
@@ -863,7 +863,8 @@ int option_get_command(dstr_t *cmd, opti
 
     /* If the value is set to a predefined choice */
     choice = option_find_choice(opt, valstr);
-    if (choice) {
+    if (choice && (*choice->command ||
+		   ((opt->type != TYPE_INT) && (opt->type != TYPE_FLOAT)))) {
         dstrcpy(cmd, choice->command);
         return 1;
     }


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- foomatic.spec	26 Nov 2009 11:21:43 -0000	1.227
+++ foomatic.spec	19 Jan 2010 17:09:26 -0000	1.228
@@ -7,7 +7,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    4%{?dist}
+Release:    5%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -29,6 +29,9 @@ Patch1: foomatic-filters-libdir.patch
 # Use mkstemp, not mktemp.
 Patch2: foomatic-mkstemp.patch
 
+# Fix for handling integer options (bug #531278).
+Patch3: foomatic-filters-int-options.patch
+
 ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
 # Use libdir.
@@ -89,6 +92,7 @@ The site http://www.linuxprinting.org/ i
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .mkstemp
+%patch3 -p1 -b .int-options
 popd
 
 pushd foomatic-db-engine-%{enginever}
@@ -245,6 +249,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 4.0.3-5
+- Fix for handling integer options (bug #531278).
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-4
 - Updated to foomatic-db-4.0-20091126 (bug #538994).