rpms/system-config-printer/F-13 system-config-printer-device-ids-warning.patch, NONE, 1.1 system-config-printer.spec, 1.359, 1.360

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16937

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-device-ids-warning.patch 
Log Message:
* Sun Feb 21 2010 Tim Waugh <twaugh at redhat.com> - 1.1.92-2
- Display a warning when the wrong IEEE 1284 Device ID is detected.


system-config-printer-device-ids-warning.patch:
 ppds.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-device-ids-warning.patch ---
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 at redhat.com>
 ## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <twaugh at 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


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/system-config-printer.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -r1.359 -r1.360
--- system-config-printer.spec	19 Feb 2010 13:46:44 -0000	1.359
+++ system-config-printer.spec	21 Feb 2010 19:04:20 -0000	1.360
@@ -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/py
 
 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 at 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 at redhat.com> - 1.1.92-1
 - 1.1.92.