jpopelka pushed to foomatic (master). "Merge branch 'f21' into f22"

[notifications at fedoraproject.org]

From adf70e5c458cd330f4c8d61b276971cb01868d99 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka at redhat.com>
Date: Thu, 21 May 2015 17:20:05 +0200
Subject: 4.0.12


diff --git a/.gitignore b/.gitignore
index 8fcff39..8da83a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/foomatic-upstream1238.patch b/foomatic-upstream1238.patch
deleted file mode 100644
index 3d5959c..0000000
--- a/foomatic-upstream1238.patch
+++ /dev/null
@@ -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;
- 	}
diff --git a/foomatic.spec b/foomatic.spec
index a26f3e0..599b59b 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -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 at redhat.com> - 4.0.12-1
+- 4.0.12
+
 * Wed Dec 17 2014 Jiri Popelka <jpopelka at redhat.com> - 4.0.11-7
 - Fix unowned dir /etc/foomatic (#1175224).
 
diff --git a/sources b/sources
index e9cbec5..ba960ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3984d1792d26055e3bd15f20659bcad7  foomatic-db-engine-4.0.11.tar.gz
+b8049e61a3dad76044e83dde0087e0a0  foomatic-db-engine-4.0.12.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/foomatic.git/commit/?h=master&id=b408d076064b8fb918508ac4f049b68e541115bf