rpms/foomatic
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Revert last change.

Browse Source
This commit is contained in:
Tim Waugh 2009-11-08 21:01:42 +00:00
parent 0f0b3fe80d
commit c60e55b479
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
foomatic-filters-custom-command.patch
View File

@ -1,12 +1,13 @@
diff -up foomatic-filters-4.0.3/options.c~ foomatic-filters-4.0.3/options.c 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~ 2009-08-19 19:08:41.000000000 +0100 --- 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-05 15:46:58.120129303 +0000 +++ foomatic-filters-4.0.3/options.c 2009-11-08 21:00:03.100887926 +0000
@@ -863,7 +863,7 @@ int option_get_command(dstr_t *cmd, opti @@ -865,7 +865,8 @@ int option_get_command(dstr_t *cmd, opti
/* If the value is set to a predefined choice */
choice = option_find_choice(opt, valstr); choice = option_find_choice(opt, valstr);
- if (choice) { if (choice) {
+ if (choice && choice->command && *choice->command) {
dstrcpy(cmd, choice->command); 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 */

9
foomatic.spec
View File

@ -4,7 +4,7 @@
Summary: Database of printers and printer drivers Summary: Database of printers and printer drivers
Name: foomatic Name: foomatic
Version: %{enginever} Version: %{enginever}
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -20,9 +20,6 @@ Patch1: foomatic-filters-libdir.patch
# Use mkstemp, not mktemp. # Use mkstemp, not mktemp.
Patch2: foomatic-mkstemp.patch 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) ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
# Use libdir. # Use libdir.
@ -71,7 +68,6 @@ The site http://www.linuxprinting.org/ is based on this database.
pushd foomatic-filters-%{filtersver} pushd foomatic-filters-%{filtersver}
%patch1 -p1 -b .libdir %patch1 -p1 -b .libdir
%patch2 -p1 -b .mkstemp %patch2 -p1 -b .mkstemp
%patch3 -p1 -b .custom-command
popd popd
pushd foomatic-db-engine-%{enginever} pushd foomatic-db-engine-%{enginever}
@ -152,6 +148,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_var}/cache/foomatic %{_var}/cache/foomatic
%changelog %changelog
* Sun Nov 8 2009 Tim Waugh <twaugh@redhat.com> 4.0.3-3
- Revert last change.
* Thu Nov 5 2009 Tim Waugh <twaugh@redhat.com> 4.0.3-2 * Thu Nov 5 2009 Tim Waugh <twaugh@redhat.com> 4.0.3-2
- Correctly build foomatic custom commands (bug #531278). - Correctly build foomatic custom commands (bug #531278).