rpms/foomatic
7
0
Fork 0
Code Issues Pull Requests Releases Activity

4.0.12

Browse Source
This commit is contained in:
Jiri Popelka 2015-05-21 17:20:05 +02:00
parent 8809d27543
commit adf70e5c45
4 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/foomatic-db-engine-4.0.9.tar.gz
/foomatic-filters-4.0.17-clean.tar.gz
/foomatic-db-engine-4.0.11.tar.gz
/foomatic-db-engine-4.0.12.tar.gz

17
foomatic-upstream1238.patch
View File

@ -1,17 +0,0 @@
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;
}

11
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: 7%{?dist}
Version: 4.0.12
Release: 1%{?dist}
License: GPLv2+
# printer-filters package has gone (bug #967316, bug #1035450).
@ -13,7 +13,6 @@ 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)
@ -64,9 +63,6 @@ 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
@ -143,6 +139,9 @@ exit 0
%{_var}/cache/foomatic
%changelog
* Thu May 21 2015 Jiri Popelka <jpopelka@redhat.com> - 4.0.12-1
- 4.0.12
* Wed Dec 17 2014 Jiri Popelka <jpopelka@redhat.com> - 4.0.11-7
- Fix unowned dir /etc/foomatic (#1175224).

2
sources
View File

@ -1 +1 @@
3984d1792d26055e3bd15f20659bcad7 foomatic-db-engine-4.0.11.tar.gz
b8049e61a3dad76044e83dde0087e0a0 foomatic-db-engine-4.0.12.tar.gz