From daf11fd8924924cdead9cf0187d6e2e0f4e29044 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 4 Jul 2014 17:14:32 +0100 Subject: [PATCH] 1.4.5. - Some codec fixes (bug #968142, bug #1023968, bug #1094037). - Traceback fixes (bug #982071, bug #1090479, bug #1105229). - IPv6 address entry fix (bug #1074245). - Auth info saving improvement (bug #1089029). - Use LockButton for fewer auth dialogs (bug #714820). Resolves: rhbz#968142 rhbz#1023968 rhbz#1094037 rhbz#982071 rhbz#1090479 rhbz#1105229 rhbz#1074245 rhbz#1089029 rhbz#714820 --- .gitignore | 1 + sources | 2 +- system-config-printer-1.4.4.tar.xz.sig | Bin 280 -> 0 bytes system-config-printer-1.4.5.tar.xz.sig | Bin 0 -> 280 bytes ...m-config-printer-openprinting-freeze.patch | 38 ------------------ system-config-printer.spec | 17 ++++---- 6 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 system-config-printer-1.4.4.tar.xz.sig create mode 100644 system-config-printer-1.4.5.tar.xz.sig delete mode 100644 system-config-printer-openprinting-freeze.patch diff --git a/.gitignore b/.gitignore index 5d77f98..3318425 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ pycups-1.9.51.tar.bz2 /system-config-printer-1.4.2.tar.xz /system-config-printer-1.4.3.tar.xz /system-config-printer-1.4.4.tar.xz +/system-config-printer-1.4.5.tar.xz diff --git a/sources b/sources index c509fa6..26b971c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -229c6ea422748a0fd7e533bba25595fc system-config-printer-1.4.4.tar.xz +defcfe0e29ab7baafc042a28f5be5949 system-config-printer-1.4.5.tar.xz diff --git a/system-config-printer-1.4.4.tar.xz.sig b/system-config-printer-1.4.4.tar.xz.sig deleted file mode 100644 index b45234f5fed587677f5eb1f6c93e5d5cbae454a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dS0TlxU08<&q4|!D*jiaHf(*XiAGza+s!s>t?c*BQ@nyilFum+wBcg34M zaI844y6`Qo0aw0PE#3MCjq_x3D@gmCAvEkchqO517+?jZgK+n#h!YN6+y{BcSjxyC zG$!0j@MthIh1&%}H=}HmijH`(bA*7tdi6qxwACYbyG5!B7+8|{(C~Dv0&7nk-A;~4 zKR6wIP7CctEzC@q# z%P)4>@B?IIFw~sX#JNJFEx2mZGu-_vl=PMY4keUdW>Vs-N0w=iuaf|@UT-pYyX=rs e*}r&XkF(D`&a(gCP*jgGp%;?UD(jD?FLI*s--Ay8 literal 0 HcmV?d00001 diff --git a/system-config-printer-openprinting-freeze.patch b/system-config-printer-openprinting-freeze.patch deleted file mode 100644 index b09d9df..0000000 --- a/system-config-printer-openprinting-freeze.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up system-config-printer-1.4.4/scp-dbus-service.py.openprinting-freeze system-config-printer-1.4.4/scp-dbus-service.py ---- system-config-printer-1.4.4/scp-dbus-service.py.openprinting-freeze 2014-01-28 16:02:43.000000000 +0000 -+++ system-config-printer-1.4.4/scp-dbus-service.py 2014-05-01 13:00:04.048257135 +0100 -@@ -194,34 +194,6 @@ class GetBestDriversRequest: - fit=fit) - ppdname = ppdnamelist[0] - status = fit[ppdname] -- -- try: -- if status != "exact" and not self.download_tried: -- self.download_tried = True -- self.loop = GObject.MainLoop () -- self.dialog = newprinter.NewPrinterGUI() -- self.dialog.NewPrinterWindow.set_modal (False) -- self.handles = \ -- [self.dialog.connect ('dialog-canceled', -- self.on_dialog_canceled), -- self.dialog.connect ('driver-download-checked', -- self.on_driver_download_checked)] -- if self.dialog.init ('download_driver', -- devid=self.device_id): -- self.loop.run() -- for handle in self.handles: -- self.dialog.disconnect (handle) -- if len(self.installed_files) > 0: -- debugprint ("GetBestDrivers request: Re-fetch PPDs after driver download") -- g_ppds = FetchedPPDs (self.cupsconn, self.language) -- self._signals.append (g_ppds.connect ('ready', self._ppds_ready)) -- self._signals.append (g_ppds.connect ('error', self._ppds_error)) -- g_ppds.run () -- return -- except: -- # Ignore driver download if packages needed for the GUI are not -- # installed or if no windows can be opened -- pass - g_killtimer.remove_hold () - self.reply_handler (map (lambda x: (x, fit[x]), ppdnamelist)) - except Exception as e: diff --git a/system-config-printer.spec b/system-config-printer.spec index 8d0d234..9cbe592 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -1,13 +1,12 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.4.4 -Release: 3%{?dist} +Version: 1.4.5 +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.4/%{name}-%{version}.tar.xz Patch1: system-config-printer-no-applet-in-gnome.patch -Patch2: system-config-printer-openprinting-freeze.patch BuildRequires: cups-devel >= 1.2 BuildRequires: desktop-file-utils >= 0.2.92 @@ -71,10 +70,6 @@ printers. # Don't start the applet in GNOME. %patch1 -p1 -b .no-applet-in-gnome -# Prevent the D-Bus service from freezing by disabling openprinting -# driver downloads in that service (bug #1052203). -%patch2 -p1 -b .openprinting-freeze - sed -i.cflags-override -e '/^CFLAGS/d' Makefile.{am,in} %build @@ -175,6 +170,14 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris exit 0 %changelog +* Fri Jul 4 2014 Tim Waugh 1.4.5-1 +- 1.4.5: + - Some codec fixes (bug #968142, bug #1023968, bug #1094037). + - Traceback fixes (bug #982071, bug #1090479, bug #1105229). + - IPv6 address entry fix (bug #1074245). + - Auth info saving improvement (bug #1089029). + - Use LockButton for fewer auth dialogs (bug #714820). + * Thu May 22 2014 Jiri Popelka - 1.4.4-3 - 1.4.x requires gtk3 instead of gtk2 (#1099611)