rpms/foomatic/F-12 foomatic-filters-custom-command.patch, 1.1, 1.2 foomatic.spec, 1.227, 1.228

[Tim Waugh]

Author: twaugh

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

Modified Files:
	foomatic-filters-custom-command.patch foomatic.spec 
Log Message:
* Sun Nov  8 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-3
- Revert last change.


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

Index: foomatic-filters-custom-command.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-12/foomatic-filters-custom-command.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- foomatic-filters-custom-command.patch	5 Nov 2009 16:02:11 -0000	1.1
+++ foomatic-filters-custom-command.patch	8 Nov 2009 21:01:42 -0000	1.2
@@ -1,12 +1,13 @@
-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 */
+diff -up foomatic-filters-4.0.3/options.c.custom-command foomatic-filters-4.0.3/options.c
+--- foomatic-filters-4.0.3/options.c.custom-command	2009-08-19 19:08:41.000000000 +0100
++++ foomatic-filters-4.0.3/options.c	2009-11-08 21:00:03.100887926 +0000
+@@ -865,7 +865,8 @@ int option_get_command(dstr_t *cmd, opti
      choice = option_find_choice(opt, valstr);
--    if (choice) {
-+    if (choice && choice->command && *choice->command) {
+     if (choice) {
          dstrcpy(cmd, choice->command);
-         return 1;
+-        return 1;
++	if (!option_use_foomatic_prototype(opt))
++	    return 1;
      }
+ 
+     /* Consider "None" as the empty string for string and password options */


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-12/foomatic.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- foomatic.spec	5 Nov 2009 16:02:11 -0000	1.227
+++ foomatic.spec	8 Nov 2009 21:01:42 -0000	1.228
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -20,9 +20,6 @@ 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.
@@ -71,7 +68,6 @@ 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}
@@ -152,6 +148,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Sun Nov  8 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-3
+- Revert last change.
+
 * Thu Nov  5 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-2
 - Correctly build foomatic custom commands (bug #531278).