diff --git a/foomatic-filters-custom-command.patch b/foomatic-filters-custom-command.patch deleted file mode 100644 index e4cd588..0000000 --- a/foomatic-filters-custom-command.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 1491fc2..236ab89 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -7,7 +7,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -29,9 +29,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. @@ -92,7 +89,6 @@ 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} @@ -249,6 +245,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Mon Nov 9 2009 Tim Waugh 4.0.3-3 +- Reverted last change. + * Thu Nov 5 2009 Tim Waugh 4.0.3-2 - Correctly build foomatic custom commands (bug #531278).