From fb3070c1ee933cdd4bcf00b4d03f8359b583aa26 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Wed, 18 Dec 2013 15:29:24 +0100
Subject: [PATCH] Remove references to invalid printers (bug #866476, bug
 #972740)

- Remove references to foo2hbpl (bug #970393)
- Updated to foomatic-db-4.0-20131218
---
 .gitignore                |  1 +
 foomatic-db-invalid.patch | 23 +++++++++++++++++++++++
 foomatic-db.spec          | 22 +++++++++++++++++++---
 sources                   |  2 +-
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 foomatic-db-invalid.patch

diff --git a/.gitignore b/.gitignore
index 9483608..6bf70b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ foomatic-db-4.0-20100204.tar.gz
 /foomatic-db-4.0-20130507.tar.gz
 /foomatic-db-4.0-20130604.tar.gz
 /foomatic-db-4.0-20130911.tar.gz
+/foomatic-db-4.0-20131218.tar.gz
diff --git a/foomatic-db-invalid.patch b/foomatic-db-invalid.patch
new file mode 100644
index 0000000..ecfe200
--- /dev/null
+++ b/foomatic-db-invalid.patch
@@ -0,0 +1,23 @@
+diff -up foomatic-db-20131218/db/source/driver/Postscript.xml.orig foomatic-db-20131218/db/source/driver/Postscript.xml
+--- foomatic-db-20131218/db/source/driver/Postscript.xml.orig	2013-12-18 01:41:18.000000000 +0100
++++ foomatic-db-20131218/db/source/driver/Postscript.xml	2013-12-18 15:09:08.471674405 +0100
+@@ -358,9 +358,6 @@
+       <id>printer/HP-Business_Inkjet_3000</id>
+     </printer>
+     <printer>
+-      <id>printer/HP-Business_Inkjet_9100</id>
+-    </printer>
+-    <printer>
+       <id>printer/HP-Color_LaserJet_2500</id>
+     </printer>
+     <printer>
+@@ -1066,9 +1063,6 @@
+       <id>printer/Oce-3155PS</id>
+     </printer>
+     <printer>
+-      <id>printer/Oce-3165</id>
+-    </printer>
+-    <printer>
+       <id>printer/Oce-3165PS</id>
+     </printer>
+     <printer>
diff --git a/foomatic-db.spec b/foomatic-db.spec
index 132e3a1..99c6d15 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -1,12 +1,12 @@
 %global dbver_rel 4.0
 # When you change dbver_snap, rebuild also foomatic against this build to pick up new IEEE 1284 Device IDs.
 # The postscriptdriver tags get put onto foomatic, because that's there the actual CUPS driver lives.
-%global dbver_snap 20130911
+%global dbver_snap 20131218
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 40.%{dbver_snap}%{?dist}
+Release: 41.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -15,6 +15,7 @@ Requires: %{name}-ppds = %{version}-%{release}
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 
 Patch1: foomatic-db-device-ids.patch
+Patch2: foomatic-db-invalid.patch
 
 Url: http://www.openprinting.org
 BuildArch: noarch
@@ -69,7 +70,8 @@ find printer -name '*.xml' |grep -E 'Samsung-CLP-300|Samsung-CLP-315|Samsung-CLP
 # foo2zjs-z1, foo2zjs-z2, foo2zjs-z3 (bug #967930)
 # foo2lava, foo2kyo, foo2xqx (bug #438319)
 # foo2slx and foo2hiperc (bug #518267)
-for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc
+# foo2hbpl2 (bug #970393)
+for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc hbpl2
 do
   find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
   rm -f driver/foo2${x}.xml opt/foo2${x}-*
@@ -77,6 +79,12 @@ done
 # Same for m2300w/m2400w
 find printer -name '*.xml' |xargs grep -l '<driver>m2[34]00w<'|xargs rm -vf
 rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
+# Binaries for these were previously provided by printer-filters, but aren't anymore (bug #972740)
+for x in lm1100 pentaxpj pbm2l2030 pbm2l7k lex5700 lex7000 c2050 c2070 cjet
+do
+  find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
+  rm -vf driver/${x}.xml opt/${x}-*
+done
 # Same for all these.
 for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j
 do
@@ -104,6 +112,9 @@ popd
 # Brother HL-2040 (bug #999040)
 %patch1 -p1
 
+# These can't be generated at all (bug #866476)
+%patch2 -p1
+
 # Use sed instead of perl in the PPDs (bug #512739).
 find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
 
@@ -150,6 +161,11 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Wed Dec 18 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-41.20131218
+- Remove references to invalid printers (bug #866476, bug #972740)
+- Remove references to foo2hbpl (bug #970393)
+- Updated to foomatic-db-4.0-20131218
+
 * Wed Sep 11 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-40.20130911
 - Updated to foomatic-db-4.0-20130911
 - Device ID for Brother HL-2040 (bug #999040)
diff --git a/sources b/sources
index d3225a9..98a2349 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d2322b35652a971bce2e212f6124f5e  foomatic-db-4.0-20130911.tar.gz
+9774943d49f37b4c2fe67fd8a2197327  foomatic-db-4.0-20131218.tar.gz