From 7efcc119f63e95943c8eb8d848b0fa750a1b356b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sun, 21 Feb 2010 19:05:37 +0000
Subject: [PATCH] - Display a warning when the wrong IEEE 1284 Device ID is
 detected.

---
 ...em-config-printer-device-ids-warning.patch | 23 +++++++++++++++++++
 system-config-printer.spec                    |  7 +++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-device-ids-warning.patch

diff --git a/system-config-printer-device-ids-warning.patch b/system-config-printer-device-ids-warning.patch
new file mode 100644
index 0000000..8ab6725
--- /dev/null
+++ b/system-config-printer-device-ids-warning.patch
@@ -0,0 +1,23 @@
+diff -up system-config-printer-1.1.92/cupshelpers/ppds.py.device-ids-warning system-config-printer-1.1.92/cupshelpers/ppds.py
+--- system-config-printer-1.1.92/cupshelpers/ppds.py.device-ids-warning	2010-01-27 11:17:44.000000000 +0000
++++ system-config-printer-1.1.92/cupshelpers/ppds.py	2010-02-21 18:27:20.767175951 +0000
+@@ -2,7 +2,7 @@
+ 
+ ## system-config-printer
+ 
+-## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
+ ## Copyright (C) 2006 Florian Festi <ffesti@redhat.com>
+ ## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <twaugh@redhat.com>
+ 
+@@ -561,6 +561,10 @@ class PPDs:
+             try:
+                 ppdnamelist += self.ids["hp"][mdll]
+                 status = self.STATUS_SUCCESS
++                print ("**** Incorrect IEEE 1284 Device ID: %s" %
++                       self.ids["hp"][mdll])
++                print "**** Actual ID is MFG:%s;MDL:%s;" % (mfg, mdl)
++                print "**** Please report a bug against the HPLIP component"
+                 id_matched = True
+             except KeyError:
+                 pass
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 716a06b..01200d6 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-lowercase-mfg-mdl.patch
+Patch3: system-config-printer-device-ids-warning.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .lowercase-mfg-mdl
+%patch3 -p1 -b .device-ids-warning
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -192,6 +194,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Sun Feb 21 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-2
+- Display a warning when the wrong IEEE 1284 Device ID is detected.
+
 * Fri Feb 19 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-1
 - 1.1.92.