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

Merge branch 'f21'

This commit is contained in:
Tim Waugh 2014-12-01 12:38:48 +00:00
parent 6e1020a7c5 2b3aaf0b10
commit b84c0698b6
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
foomatic-upstream1238.patch Normal file
View File

@ -0,0 +1,17 @@
diff -U0 foomatic-db-engine-4.0.11/ChangeLog.upstream1238 foomatic-db-engine-4.0.11/ChangeLog
diff -up foomatic-db-engine-4.0.11/foomatic-ppdfile.in.upstream1238 foomatic-db-engine-4.0.11/foomatic-ppdfile.in
--- foomatic-db-engine-4.0.11/foomatic-ppdfile.in.upstream1238 2014-03-20 15:20:06.000000000 +0000
+++ foomatic-db-engine-4.0.11/foomatic-ppdfile.in 2014-12-01 12:28:18.866470793 +0000
@@ -195,8 +195,10 @@ sub generateppd {
unshift(@drivercomponents, pop(@poidcomponents));
$driver = join('-', @drivercomponents);
$printer = join('-', @poidcomponents);
- next if (!Foomatic::DB::member($driver, @drivers) or
- !Foomatic::DB::member($printer, @printers));
+ my @driver_printers = $db->get_printers_for_driver ($driver);
+ next if ((!Foomatic::DB::member($driver, @drivers) or
+ !Foomatic::DB::member($printer, @printers)) and
+ !Foomatic::DB::member($printer, @driver_printers));
$poid = $printer;
last;
}

9
foomatic.spec
View File

@ -1,7 +1,7 @@
Summary: Tools for using the foomatic database of printers and printer drivers
Name: foomatic
Version: 4.0.11
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
# printer-filters package has gone (bug #967316, bug #1035450).
@ -13,6 +13,7 @@ Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{vers
## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
Patch101: foomatic-manpages.patch
Patch102: foomatic-upstream1238.patch
## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
@ -63,6 +64,9 @@ The site http://www.linuxprinting.org/ is based on this database.
# Ship more manpages.
%patch101 -p1 -b .manpages
# Fix for upstream bug #1238 (bug #1163731).
%patch102 -p1 -b .upstream1238
chmod a+x mkinstalldirs
%build
@ -138,6 +142,9 @@ exit 0
%{_var}/cache/foomatic
%changelog
* Mon Dec 1 2014 Tim Waugh <twaugh@redhat.com> - 4.0.11-9
- Fix for upstream bug #1238 (bug #1163731).
* Sun Sep 07 2014 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.11-8
- Perl 5.20 re-rebuild of bootstrapped packages