From 73315505b8a924ad5ff3cf4a1885862a266e5848 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 29 Oct 2009 16:46:22 +0000
Subject: [PATCH] - Removed incorrect Device ID for Brother HL-2060 (bug
 #531370).

---
 gutenprint-brother-hl-2040.patch | 12 ++++++++++++
 gutenprint.spec                  |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gutenprint-brother-hl-2040.patch

diff --git a/gutenprint-brother-hl-2040.patch b/gutenprint-brother-hl-2040.patch
new file mode 100644
index 0000000..fe58957
--- /dev/null
+++ b/gutenprint-brother-hl-2040.patch
@@ -0,0 +1,12 @@
+diff -up gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040 gutenprint-5.2.4/src/xml/printers.xml
+--- gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040	2009-10-28 11:32:31.144140897 +0000
++++ gutenprint-5.2.4/src/xml/printers.xml	2009-10-28 11:33:08.490015268 +0000
+@@ -635,7 +635,7 @@
+       <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+       <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+       <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+-      <printer translate="name" name="Brother HL-2060" deviceid="MFG:Brother;MDL:HL-2040 series;DES:None;CMD:PJL,HBP;" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
++      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+       <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+       <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+       <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
diff --git a/gutenprint.spec b/gutenprint.spec
index e0c05be..fda6eb5 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
 Patch3:         gutenprint-deviceid.patch
+Patch4:         gutenprint-brother-hl-2040.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -139,6 +140,7 @@ Epson, HP and compatible printers.
 %patch1 -p1 -b .O6
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .deviceid
+%patch4 -p1 -b .brother-hl-2040
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
@@ -267,6 +269,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh@redhat.com> 5.2.4-7
+- Removed incorrect Device ID for Brother HL-2060 (bug #531370).
+
 * Mon Sep 28 2009 Tim Waugh <twaugh@redhat.com> 5.2.4-6
 - Reimplemented PPD upgrade script in Python to avoid perl
   dependency (bug #524978).