From 5de4b3c03e3a0a9160bba89c2c7d4f45d56f4e49 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 24 2004 15:57:51 +0000
Subject: - Updated db to 20041124.

- Updated hpijs-db to 1.5-20041124.
- No longer need HP DJ 6122 patch.
- No longer need ieee1284 patch.
- Updated Omni-printers to 0.9.2.

---

diff --git a/.cvsignore b/.cvsignore
index a5b00eb..8e6b70c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,6 @@ foomatic-filters-3.0.1.tar.gz
 gimp-print-foomatic-db-4.2.7.tar.bz2
 foomatic-db-engine-3.0.2.tar.gz
 foomatic-filters-3.0.2.tar.gz
+foomatic-db-hpijs-1.5-20041124.tar.gz
+foomatic-db-20041124.tar.gz
+Omni-printers-0.9.2.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index 112402e..37c0aec 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,12 +1,12 @@
-%define dbver 20040712
+%define dbver 20041124
 %define enginever 3.0.2
 %define filtersver 3.0.2
-%define hpijsver 1.5-20040219
+%define hpijsver 1.5-20041124
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 8
+Release: 9
 License:	GPL
 Group: System Environment/Libraries
 
@@ -21,7 +21,7 @@ Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver}.tar
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 # Build Omni first to get this (you'll have to create the tarball by hand):
-Source4: Omni-printers-0.9.1.tar.bz2
+Source4: Omni-printers-0.9.2.tar.bz2
 
 # The foomatic-db info from gimp-print (--with-ijs --with-foomatic)
 Source5: gimp-print-foomatic-db-4.2.7.tar.bz2
@@ -48,20 +48,6 @@ Patch10: foomatic-db-engine-xml-cflags.patch
 
 Patch11: foomatic-rip-cvs.patch
 
-# Add autodetect information for HP DJ 6122 (bug #124629).
-Patch12: foomatic-hpdj6122.patch
-
-# Add autodetect information for HP DJ 1220.
-# Add autodetect information for Brother HL-5050 (bug #131220).
-# Add autodetect information for HP DJ 640C (bug #134912).
-# Add autodetect information for HP DJ 3820 (bug #139271).
-# Add autodetect information for Epson Stylus Photo 790 (bug #139266).
-# Add autodetect information for HP Business InkJet 1100 (bug #139258).
-# Add autodetect information for Epson Stylus Color 777 (bug #139629).
-# Add autodetect information for HP LaserJet 8150 (bug #139683).
-# Add autodetect information for HP Color LaserJet 4550 (bug #139799).
-Patch13: foomatic-ieee1284.patch
-
 # Make foomatic-db-engine build.
 Patch14: foomatic-ampathxml.patch
 
@@ -133,8 +119,6 @@ popd
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 %patch8 -p1 -b .hplj5
-%patch12 -p1 -b .hpdj6122
-%patch13 -p1 -b .ieee1284
 
 # Omni printers
 tar xjf %{SOURCE4}
@@ -276,6 +260,13 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/*/*
 
 %changelog
+* Wed Nov 24 2004 Tim Waugh <twaugh@redhat.com> 3.0.2-9
+- Updated db to 20041124.
+- Updated hpijs-db to 1.5-20041124.
+- No longer need HP DJ 6122 patch.
+- No longer need ieee1284 patch.
+- Updated Omni-printers to 0.9.2.
+
 * Wed Nov 24 2004 Tim Waugh <twaugh@redhat.com> 3.0.2-8
 - Minor PPD.pm fix for PPD import (bug #132625).
 
diff --git a/sources b/sources
index f97d799..1524947 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-2422ebfd69519b2d1822fba4c76bbb30  Omni-printers-0.9.1.tar.bz2
-b4968c0846c5be3a995c4b5a76fc75e0  foomatic-db-20040712.tar.gz
-a968196fd540be53200220a785c2c518  foomatic-db-hpijs-1.5-20040219.tar.gz
 e5cac8f30f0c39b576c1a25008a06198  gimp-print-foomatic-db-4.2.7.tar.bz2
 3061b8d3f7870467e6fbeae8d4399211  foomatic-db-engine-3.0.2.tar.gz
 f0f4c90fa0ae346f53bf19a165e071a6  foomatic-filters-3.0.2.tar.gz
+34962482fde546f247da73b2b7bafe51  foomatic-db-hpijs-1.5-20041124.tar.gz
+6b832eae4475706087cbe1ac7e8af32f  foomatic-db-20041124.tar.gz
+dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2