From 34159b4247d73fe9d08ac816a841d7e569c988a1 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 3 Nov 2006 17:39:00 +0000
Subject: [PATCH] - Updated db-engine to 3.0-20061031. - Updated db to
 3.0-20061031.

---
 .cvsignore    |  1 +
 foomatic.spec | 27 +++++++++------------------
 sources       |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8628bfa..88df19d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -29,3 +29,4 @@ foomatic-db-3.0-20060103.tar.gz
 foomatic-db-3.0-20060116.tar.gz
 foomatic-db-engine-3.0-20060117.tar.gz
 foomatic-db-engine-3.0-20060421.tar.gz
+foomatic-db-engine-3.0-20061031.tar.gz
diff --git a/foomatic.spec b/foomatic.spec
index d7b5b3b..9a2a97d 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,5 +1,5 @@
-%define dbver 20060116
-%define enginever 3.0-20060421
+%define dbver 20061031
+%define enginever 3.0-20061031
 %define filtersver 20051209
 %define hpijsver 1.5-20051209
 
@@ -39,12 +39,6 @@ Patch5: foomatic-2.0.2-fontpath.patch
 Patch6: foomatic-ppdload.patch
 Patch7: foomatic-ppdload-ppd.patch
 
-# Make CUPS driver work with drivers containing '-' in their names.
-Patch8: foomatic-driver-names.patch
-
-# Don't break gimp-print driver
-Patch9: foomatic-printoutmode.patch
-
 # Fix 3.0.2 build.
 Patch10: foomatic-db-engine-xml-cflags.patch
 
@@ -54,9 +48,6 @@ Patch14: foomatic-ampathxml.patch
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
-# Fix tag mismatch in db.
-Patch16: foomatic-badxml.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -107,7 +98,6 @@ pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
 %patch6 -p1 -b .ppdload
-%patch8 -p1 -b .driver-names
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
@@ -119,7 +109,6 @@ popd
 
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
-%patch16 -p1 -b .badxml
 
 %if %with_omni
 # Omni printers
@@ -127,20 +116,20 @@ tar xjf %{SOURCE4}
 %endif
 
 # Gimp-print-4.2.0 driver info
-rm db/source/driver/stp.xml
 pushd db/source
 tar xjf %{SOURCE5}
 # Fix up 'gimp-print' references to point to 'gimp-print-ijs'.
 perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml
 
+# Recommend gimp-print-ijs instead of gutenprint, just until it
+# gets into Core.  Anyway, there isn't a 'gutenprint' foomatic driver;
+# instead it's gutenprint-ijs.5.0 or gutenprint-ijs-simplified.5.0
+perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' printer/*.xml
+
 # Remove references to foo2zjs and foo2oak (bug #208851).
 find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f
 rm -f driver/foo2zjs.xml driver/foo2oak.xml
 
-popd
-rm -f db/source/opt/gimp-print-printoutmode.xml
-%patch9 -p1 -b .printoutmode
-
 popd
 
 %build
@@ -284,6 +273,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %changelog
 * Fri Nov  3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-39
+- Updated db-engine to 3.0-20061031.
+- Updated db to 3.0-20061031.
 - Remove references to foo2zjs and foo2oak (bug #208851).
 
 * Thu Aug  3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-38
diff --git a/sources b/sources
index 898469e..373d3f7 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 8c217af8a570124d9ad7f8a4b1270ebe  foomatic-db-hpijs-1.5-20051209.tar.gz
 54ae910edbb0ed3816cebe05a0f0b605  foomatic-db-3.0-20060116.tar.gz
-54e5a0daf74d9d0e851069f54f5b6995  foomatic-db-engine-3.0-20060421.tar.gz
+0e72faf4d098cfc37f16467edf6c2570  foomatic-db-engine-3.0-20061031.tar.gz