From 827f0f3c2fa055e662ae802670363d302ff18535 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sep 04 2008 09:28:12 +0000
Subject: - Updated db to 20080904.


---

diff --git a/.cvsignore b/.cvsignore
index 1631007..5203d43 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -60,3 +60,4 @@ foomatic-db-3.0-20080710.tar.gz
 foomatic-db-hpijs-20080710.tar.gz
 foomatic-db-engine-3.0-20080904.tar.gz
 foomatic-filters-3.0-20080904.tar.gz
+foomatic-db-3.0-20080904.tar.gz
diff --git a/foomatic-459847.patch b/foomatic-459847.patch
deleted file mode 100644
index 3763c2e..0000000
--- a/foomatic-459847.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847 foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml
---- foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml.459847	2008-09-02 11:06:58.000000000 +0100
-+++ foomatic-db-20080211/db/source/printer/HP-LaserJet_4345_MFP.xml	2008-09-02 11:07:27.000000000 +0100
-@@ -1,6 +1,6 @@
- <printer id="printer/HP-LaserJet_4345_MFP">
-   <make>HP</make>
--  <model>LaserJet 4345 mfp</model>
-+  <model>LaserJet 4345 MFP</model>
-   <mechanism>
-     <laser/><!--not "color"-->
-     <resolution>
diff --git a/foomatic-hpclj9500mfp.patch b/foomatic-hpclj9500mfp.patch
deleted file mode 100644
index 1b389ff..0000000
--- a/foomatic-hpclj9500mfp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
---- foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml.hpclj9500mfp	2008-09-02 16:51:29.000000000 +0100
-+++ foomatic-db-20080710/db/source/printer/HP-Color_LaserJet_9500_MFP.xml	2008-09-02 16:51:39.000000000 +0100
-@@ -1,6 +1,6 @@
- <printer id="printer/HP-Color_LaserJet_9500_MFP">
-   <make>HP</make>
--  <model>ColorLaserJet 9500 MFP</model>
-+  <model>Color LaserJet 9500 MFP</model>
-   <mechanism>
-     <laser/>
-     <color/>
diff --git a/foomatic.spec b/foomatic.spec
index 4c1bd28..5f9fa66 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,4 +1,4 @@
-%define dbver 20080710
+%define dbver 20080904
 %define enginever 3.0-20080904
 %define filtersver 20080904
 %define hpijsver 20080710
@@ -37,8 +37,6 @@ Patch14: foomatic-ampathxml.patch
 Patch15: foomatic-bad-utf8.patch
 
 Patch18: foomatic-sigpipe.patch
-Patch19: foomatic-459847.patch
-Patch21: foomatic-hpclj9500mfp.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -100,8 +98,6 @@ pushd foomatic-db-hpijs-%{hpijsver}
 popd
 
 pushd foomatic-db-%{dbver}
-%patch19 -p1 -b .459847
-%patch21 -p1 -b .hpclj9500mfp
 
 cd db/source
 
@@ -245,6 +241,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %changelog
 * Thu Sep  4 2008 Tim Waugh <twaugh@redhat.com>
+- Updated db to 20080904.
 - Updated filters to 3.0-20080904.
 - Updated db-engine to 3.0-20080904.
 
diff --git a/sources b/sources
index 564ecc2..9d393ce 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-f959c63dface3453aa0918df3bf6f6a8  foomatic-db-3.0-20080710.tar.gz
 35a3a1ebe3c09b9e9a126e31bceedd72  foomatic-db-hpijs-20080710.tar.gz
 d46d1a26a8199c8c5c618ad2cd17a68a  foomatic-db-engine-3.0-20080904.tar.gz
 ce3332981735ce5b50932640a6107220  foomatic-filters-3.0-20080904.tar.gz
+758ac14a7068a3c2016608d35c8994c7  foomatic-db-3.0-20080904.tar.gz