From dfad6a2fd65793f0d021626e1691772751683c41 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Wed, 9 Feb 2011 18:01:44 +0100 Subject: [PATCH] 1.2.97 --- .gitignore | 1 + sources | 2 +- system-config-printer-1.2.96.tar.xz.sig | Bin 65 -> 0 bytes system-config-printer-1.2.97.tar.xz.sig | Bin 0 -> 65 bytes system-config-printer-dnssd-URI.patch | 12 ----- system-config-printer-duplicate-PPDs.patch | 56 --------------------- system-config-printer-ungrab-focus.patch | 11 ---- system-config-printer.spec | 30 +++++------ 8 files changed, 18 insertions(+), 94 deletions(-) delete mode 100644 system-config-printer-1.2.96.tar.xz.sig create mode 100644 system-config-printer-1.2.97.tar.xz.sig delete mode 100644 system-config-printer-dnssd-URI.patch delete mode 100644 system-config-printer-duplicate-PPDs.patch delete mode 100644 system-config-printer-ungrab-focus.patch diff --git a/.gitignore b/.gitignore index 1249deb..c388f02 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ pycups-1.9.51.tar.bz2 /system-config-printer-1.2.5.tar.xz /system-config-printer-1.2.95.tar.xz /system-config-printer-1.2.96.tar.xz +/system-config-printer-1.2.97.tar.xz diff --git a/sources b/sources index ec158eb..00aa7cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90a4e4bdb404758d4ad69d772fb3e5e1 system-config-printer-1.2.96.tar.xz +6abd02bb95b13a20bdb4585b5bbd0928 system-config-printer-1.2.97.tar.xz diff --git a/system-config-printer-1.2.96.tar.xz.sig b/system-config-printer-1.2.96.tar.xz.sig deleted file mode 100644 index ad09278d4088dd5ce7be533e516a0684edd04be6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-O)!Dr1hg7`no8Q&5dtpm0HCb_DWUw|E-9UyE93McN+JVKc>VyN XL(2&xk<;7R>$D&|S0Gp19P^2MT;&`_ diff --git a/system-config-printer-1.2.97.tar.xz.sig b/system-config-printer-1.2.97.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..6878fddb94588304827b79769f7ed9bc378a0377 GIT binary patch literal 65 zcmV-H0KWf-KLZ5-O;Wu-1hg7`no8Q&5dxaJ0H0$*!0b2}z9%%zmMmQ}-;?Hcw~PRw XofH87Gr8}mcjY}LfsVmH_NfY;XQ~|~ literal 0 HcmV?d00001 diff --git a/system-config-printer-dnssd-URI.patch b/system-config-printer-dnssd-URI.patch deleted file mode 100644 index a96bb79..0000000 --- a/system-config-printer-dnssd-URI.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up system-config-printer-1.2.96/newprinter.py.dnssd-URI system-config-printer-1.2.96/newprinter.py ---- system-config-printer-1.2.96/newprinter.py.dnssd-URI 2011-01-18 11:59:38.000000000 +0100 -+++ system-config-printer-1.2.96/newprinter.py 2011-01-18 12:00:05.000000000 +0100 -@@ -2156,7 +2156,7 @@ class NewPrinterGUI(GtkGUI): - entry.set_text(new_text) - - def on_entNPTDevice_changed(self, ent): -- allowed_chars = string.letters+string.digits+'_-./:' -+ allowed_chars = string.letters+string.digits+'_-./:%()' - self.entry_changed(ent, allowed_chars) - self.setNPButtons() - diff --git a/system-config-printer-duplicate-PPDs.patch b/system-config-printer-duplicate-PPDs.patch deleted file mode 100644 index 4a75396..0000000 --- a/system-config-printer-duplicate-PPDs.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up system-config-printer-1.2.96/newprinter.py.duplicate-PPDs system-config-printer-1.2.96/newprinter.py ---- system-config-printer-1.2.96/newprinter.py.duplicate-PPDs 2011-01-21 12:59:20.000000000 +0100 -+++ system-config-printer-1.2.96/newprinter.py 2011-01-21 13:05:50.000000000 +0100 -@@ -3024,8 +3024,10 @@ class NewPrinterGUI(GtkGUI): - self.NPDrivers = drivers - - driverlist = [] -- for i in range (len(self.NPDrivers)): -- ppd = self.ppds.getInfoFromPPDName (self.NPDrivers[i]) -+ NPDrivers = [] -+ i = 0 -+ for ppdname in self.NPDrivers: -+ ppd = self.ppds.getInfoFromPPDName (ppdname) - driver = _singleton (ppd["ppd-make-and-model"]) - driver = driver.replace(" (recommended)", "") - -@@ -3035,18 +3037,20 @@ class NewPrinterGUI(GtkGUI): - except KeyError: - pass - -- duplicate = False -- if driver in driverlist: -- duplicate = True -- else: -- driverlist.append (driver) -+ duplicate = driver in driverlist - -- if not self.device and self.auto_driver == self.NPDrivers[i]: -+ if not self.device and self.auto_driver == ppdname: -+ driverlist.append (driver) -+ NPDrivers.append (ppdname) -+ i += 1 - iter = model.append ((driver + _(" (Current)"),)) - path = model.get_path (iter) - self.tvNPDrivers.get_selection().select_path(path) - self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0) -- elif self.device and self.recommended_model_selected and i == 0: -+ elif self.device and i == 0: -+ driverlist.append (driver) -+ NPDrivers.append (ppdname) -+ i += 1 - iter = model.append ((driver + _(" (recommended)"),)) - path = model.get_path (iter) - self.tvNPDrivers.get_selection().select_path(path) -@@ -3054,7 +3058,11 @@ class NewPrinterGUI(GtkGUI): - else: - if duplicate: - continue -+ driverlist.append (driver) -+ NPDrivers.append (ppdname) -+ i += 1 - model.append((driver, )) -+ self.NPDrivers = NPDrivers - self.tvNPDrivers.columns_autosize() - - def on_NPDrivers_query_tooltip(self, tv, x, y, keyboard_mode, tooltip): diff --git a/system-config-printer-ungrab-focus.patch b/system-config-printer-ungrab-focus.patch deleted file mode 100644 index 2dbdecc..0000000 --- a/system-config-printer-ungrab-focus.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up system-config-printer-1.2.96/system-config-printer.py.ungrab-focus system-config-printer-1.2.96/system-config-printer.py ---- system-config-printer-1.2.96/system-config-printer.py.ungrab-focus 2011-01-14 17:17:32.000000000 +0100 -+++ system-config-printer-1.2.96/system-config-printer.py 2011-01-21 13:07:54.000000000 +0100 -@@ -1404,7 +1404,6 @@ class GUI(GtkGUI): - self.rename_sigids = ids - self.rename_entry_sigid = None - self.dests_iconview.set_cursor (path, cell, start_editing=True) -- self.dests_iconview.grab_focus () - - def printer_name_edit_start (self, cell, editable, path): - debugprint ("editing-started") diff --git a/system-config-printer.spec b/system-config-printer.spec index d6a325f..34570a2 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -4,15 +4,12 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.2.96 -Release: 3%{?dist} +Version: 1.2.97 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{version}.tar.xz -Patch1: system-config-printer-dnssd-URI.patch -Patch2: system-config-printer-duplicate-PPDs.patch -Patch3: system-config-printer-ungrab-focus.patch BuildRequires: cups-devel >= 1.2 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: gettext-devel @@ -34,6 +31,7 @@ Requires: notify-python Requires: gnome-python2-gnomekeyring Requires: libxml2-python Requires: python-smbc +Requires: python-slip-gtk Obsoletes: system-config-printer-gui <= 0.6.152 Provides: system-config-printer-gui = 0.6.152 @@ -69,15 +67,6 @@ printers. %prep %setup -q -# Allow %, ( and ) characters in dnssd URI (bug #669820). -%patch1 -p1 -b .dnssd-URI - -# Fixed driver selection when there are duplicate PPDs available. (#667571) -%patch2 -p1 -b .duplicate-PPDs - -# Grabbing focus for editing breaks it (bug #650995). -%patch3 -p1 -b .ungrab-focus - %build %configure --with-udev-rules @@ -186,6 +175,19 @@ rm -rf %buildroot exit 0 %changelog +* Wed Feb 09 2011 Jiri Popelka 1.2.97-1 +- 1.2.97: + - Handle failure to connect in PrinterURIIndex (bug #668568). + - Fixed bugs in gtk_label_autowrap.py (bug #637829). + - Avoid Foomatic/pxlmono until output size issue is fixed (bug #661814). + - Avoid traceback when notification daemon has persistence (bug #671375). + - Don't crash when DISPLAY is unset (bug #676339, #676343). + - Improvements for DNS-SD support from Till Kamppeter + - troubleshoot: handle wrong server name but right IP address. + - Update printer properties after NewPrinter dialog has changed PPD/device. + - Don't rely on CUPS_PRINTER_COMMANDS alone. + - Use set_autowrap() from slip.gtk module when possible. + * Fri Jan 21 2011 Jiri Popelka 1.2.96-3 - Fixed driver selection when there are duplicate PPDs available. (#667571) - Grabbing focus for editing breaks it (bug #650995).