From 778bd7fad44ddaf7a797499dcc0a92c33ad60183 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 30 2007 11:37:57 +0000
Subject: - Don't ship old gimp-print data (bug #234388).

- Resolves: rhbz#234388

---

diff --git a/foomatic.spec b/foomatic.spec
index 372765a..4fecbb5 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    45%{?dist}
+Release:    46%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -25,9 +25,6 @@ Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpij
 # Build Omni first to get this (you'll have to create the tarball by hand):
 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
-
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
 Patch2: foomatic-db-engine-libdir.patch
@@ -115,12 +112,6 @@ pushd foomatic-db-%{dbver}
 tar xjf %{SOURCE4}
 %endif
 
-# Gimp-print-4.2.7 driver info
-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
-
 # For gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 
@@ -273,6 +264,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Mar 30 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-46
+- Don't ship old gimp-print data (bug #234388).
+
 * Thu Jan 11 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-45
 - Leave gutenprint-recommended printers alone, rather than pointing them
   to gimp-print as before.
diff --git a/sources b/sources
index 65af231..3ec732c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-e5cac8f30f0c39b576c1a25008a06198  gimp-print-foomatic-db-4.2.7.tar.bz2
 dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 480ab4a4148667dad1ffc188b6480bce  foomatic-db-hpijs-20061031.tar.gz