diff --git a/.cvsignore b/.cvsignore index aaa1517..e4b1df4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -213,3 +213,4 @@ pycups-1.9.48.tar.bz2 system-config-printer-1.1.90.tar.xz system-config-printer-1.1.91.tar.xz system-config-printer-1.1.92.tar.xz +system-config-printer-1.1.93.tar.xz diff --git a/sources b/sources index 1a5b178..5fa4782 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ ac8f98a40b0fc4b6ab4470f10489887a pysmbc-1.0.6.tar.bz2 2e9ed692c75328e7fb88f8c230f70990 pycups-1.9.48.tar.bz2 -773811075ef52e9afd540a6583cf647f system-config-printer-1.1.92.tar.xz +454506953f2be06865536953cdba8f05 system-config-printer-1.1.93.tar.xz diff --git a/system-config-printer-1.1.92.tar.xz.sig b/system-config-printer-1.1.92.tar.xz.sig deleted file mode 100644 index 43b8a4b..0000000 Binary files a/system-config-printer-1.1.92.tar.xz.sig and /dev/null differ diff --git a/system-config-printer-1.1.93.tar.xz.sig b/system-config-printer-1.1.93.tar.xz.sig new file mode 100644 index 0000000..7c41b8d Binary files /dev/null and b/system-config-printer-1.1.93.tar.xz.sig differ diff --git a/system-config-printer-cupsGetPPD2.patch b/system-config-printer-cupsGetPPD2.patch deleted file mode 100644 index 50c02b6..0000000 --- a/system-config-printer-cupsGetPPD2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up system-config-printer-1.1.92/statereason.py.cupsGetPPD2 system-config-printer-1.1.92/statereason.py ---- system-config-printer-1.1.92/statereason.py.cupsGetPPD2 2010-02-18 16:17:48.000000000 +0100 -+++ system-config-printer-1.1.92/statereason.py 2010-02-22 12:10:09.000000000 +0100 -@@ -138,7 +138,7 @@ class StateReason: - f = self.connection.getPPD(self.printer) - self._ppd = cups.PPD (f) - os.unlink (f) -- except (cups.IPPError, OSError): -+ except (cups.IPPError, RuntimeError, OSError): - pass - - reason = self.get_reason () diff --git a/system-config-printer-device-ids-warning.patch b/system-config-printer-device-ids-warning.patch deleted file mode 100644 index 8ab6725..0000000 --- a/system-config-printer-device-ids-warning.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - ## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh - -@@ -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-no-device-id-hacks.patch b/system-config-printer-no-device-id-hacks.patch deleted file mode 100644 index 6914125..0000000 --- a/system-config-printer-no-device-id-hacks.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up system-config-printer-1.1.92/cupshelpers/ppds.py.no-device-id-hacks system-config-printer-1.1.92/cupshelpers/ppds.py ---- system-config-printer-1.1.92/cupshelpers/ppds.py.no-device-id-hacks 2010-02-22 17:16:47.012355185 +0000 -+++ system-config-printer-1.1.92/cupshelpers/ppds.py 2010-02-22 17:17:57.924354751 +0000 -@@ -900,20 +900,10 @@ class PPDs: - if not id: - continue - -- # Fix up broken Kyocera IDs -- v = id.find (":Model") -- if v != -1: -- id = id[:v] + ';' + id[v + 1:] -- - id_dict = parseDeviceID (id) - lmfg = id_dict['MFG'].lower () - lmdl = id_dict['MDL'].lower () - -- # Consider "HP" and "Hewlett-Packard" as equal, as the ID returned -- # by the CUPS "usb" backend and HPLIP's "hp" backend are different -- if lmfg == "hewlett-packard": -- lmfg = "hp" -- - bad = False - if len (lmfg) == 0: - _debugprint ("Missing MFG field for %s" % ppdname) diff --git a/system-config-printer.spec b/system-config-printer.spec index 24f217f..d9c968c 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -6,8 +6,8 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.1.92 -Release: 4%{?dist} +Version: 1.1.93 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -17,9 +17,6 @@ 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 -Patch4: system-config-printer-cupsGetPPD2.patch -Patch5: system-config-printer-no-device-id-hacks.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -80,9 +77,6 @@ printers. %setup -q -a 1 -a 2 %patch1 -p1 -b .no-epydoc %patch2 -p1 -b .lowercase-mfg-mdl -%patch3 -p1 -b .device-ids-warning -%patch4 -p1 -b .cupsGetPPD2 -%patch5 -p1 -b .no-device-id-hacks %build %configure --with-udev-rules --with-polkit-1 @@ -152,6 +146,7 @@ rm -rf %buildroot %{_datadir}/%{name}/asyncipp.py* %{_datadir}/%{name}/asyncpk1.py* %{_datadir}/%{name}/authconn.py* +%{_datadir}/%{name}/check-device-ids.py* %{_datadir}/%{name}/config.py* %{_datadir}/%{name}/cupspk.py* %{_datadir}/%{name}/debug.py* @@ -198,6 +193,9 @@ rm -rf %buildroot exit 0 %changelog +* Sat Feb 27 2010 Tim Waugh - 1.1.93-1 +- 1.1.93. + * Mon Feb 22 2010 Tim Waugh - 1.1.92-4 - Removed Device ID hacks for Kyocera and HP. This avoids a false positive for the incorrect-Device-ID warning.