rpms/foomatic/F-12 foomatic-filters-custom-command.patch, NONE, 1.1 foomatic.spec, 1.226, 1.227

[Tim Waugh]

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-filters-custom-command.patch 
Log Message:
* Thu Nov  5 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-2
- Correctly build foomatic custom commands (bug #531278).


foomatic-filters-custom-command.patch:
 options.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE foomatic-filters-custom-command.patch ---
diff -up foomatic-filters-4.0.3/options.c~ foomatic-filters-4.0.3/options.c
--- foomatic-filters-4.0.3/options.c~	2009-08-19 19:08:41.000000000 +0100
+++ foomatic-filters-4.0.3/options.c	2009-11-05 15:46:58.120129303 +0000
@@ -863,7 +863,7 @@ 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 && *choice->command) {
         dstrcpy(cmd, choice->command);
         return 1;
     }


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-12/foomatic.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- foomatic.spec	1 Sep 2009 12:14:36 -0000	1.226
+++ foomatic.spec	5 Nov 2009 16:02:11 -0000	1.227
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -20,6 +20,9 @@ Patch1: foomatic-filters-libdir.patch
 # Use mkstemp, not mktemp.
 Patch2: foomatic-mkstemp.patch
 
+# Correctly build foomatic custom commands (bug #531278).
+Patch3: foomatic-filters-custom-command.patch
+
 ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
 # Use libdir.
@@ -68,6 +71,7 @@ The site http://www.linuxprinting.org/ i
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .mkstemp
+%patch3 -p1 -b .custom-command
 popd
 
 pushd foomatic-db-engine-%{enginever}
@@ -148,6 +152,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Nov  5 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-2
+- Correctly build foomatic custom commands (bug #531278).
+
 * Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
 - 4.0.3.