From 0f0b3fe80da3565c2c5c12610ad555bce909b661 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 05 2009 16:02:11 +0000
Subject: - Correctly build foomatic custom commands (bug #531278).


---

diff --git a/foomatic-filters-custom-command.patch b/foomatic-filters-custom-command.patch
new file mode 100644
index 0000000..e4cd588
--- /dev/null
+++ b/foomatic-filters-custom-command.patch
@@ -0,0 +1,12 @@
+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;
+     }
diff --git a/foomatic.spec b/foomatic.spec
index fefce71..15f451f 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -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/ is based on this database.
 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@redhat.com> 4.0.3-2
+- Correctly build foomatic custom commands (bug #531278).
+
 * Tue Sep  1 2009 Tim Waugh <twaugh@redhat.com> 4.0.3-1
 - 4.0.3.