- No longer requires gnome-icon-theme (bug #1163928).
- Fixed race condition when fetching devices (bug #1176443).
- Fixed typo preventing retrieve/reprint from working.
- Driver installation fixes.
- Various other fixes.

Resolves: rhbz#1163928 rhbz#1176443
This commit is contained in:
Tim Waugh 2015-02-06 18:16:02 +00:00
parent adf2fa4d0f
commit c8da20d1b2
8 changed files with 12 additions and 52 deletions

1
.gitignore vendored
View File

@ -254,3 +254,4 @@ pycups-1.9.51.tar.bz2
/system-config-printer-1.5.2.tar.xz
/system-config-printer-1.5.3.tar.xz
/system-config-printer-1.5.4.tar.xz
/system-config-printer-1.5.5.tar.xz

View File

@ -1 +1 @@
dd5b4c6b8c47e2bd780960b38a8e9a77 system-config-printer-1.5.4.tar.xz
1aaee6a90449ee0c6b90da2eb5df03a9 system-config-printer-1.5.5.tar.xz

Binary file not shown.

View File

@ -1,12 +0,0 @@
diff -up system-config-printer-1.5.2/scp-dbus-service.py.python3 system-config-printer-1.5.2/scp-dbus-service.py
--- system-config-printer-1.5.2/scp-dbus-service.py.python3 2014-10-10 16:42:42.000000000 +0100
+++ system-config-printer-1.5.2/scp-dbus-service.py 2014-10-10 17:20:32.792518638 +0100
@@ -295,7 +295,7 @@ class GroupPhysicalDevicesRequest:
# (in self.devices) have been modified.
try:
self.physdevs = []
- for device_uri, deviceobj in self.deviceobjs.iteritems ():
+ for device_uri, deviceobj in self.deviceobjs.items ():
newphysicaldevice = PhysicalDevice.PhysicalDevice (deviceobj)
matched = False
try:

View File

@ -1,25 +0,0 @@
diff -up system-config-printer-1.4.5/jobviewer.py.retrieve system-config-printer-1.4.5/jobviewer.py
--- system-config-printer-1.4.5/jobviewer.py.retrieve 2014-07-04 16:21:48.000000000 +0100
+++ system-config-printer-1.4.5/jobviewer.py 2014-07-14 11:04:27.392705510 +0100
@@ -1424,14 +1424,19 @@ class JobViewer (GtkGUI):
host=self.host,
port=self.port,
encryption=self.encryption)
- except RuntimeError:
+ except RuntimeError as e:
+ print e
return
for jobid in self.jobids:
try:
attrs=c.getJobAttributes(jobid)
printer_uri=attrs['job-printer-uri']
- document_count=attrs.get ('document-count', 0)
+ try:
+ document_count = attrs['number-of-documents']
+ except KeyError:
+ document_count = attrs.get ('document-count', 0)
+
for document_number in range(1, document_count+1):
document=c.getDocument(printer_uri, jobid, document_number)
tempfile = document.get('file')

View File

@ -1,12 +0,0 @@
diff -up system-config-printer-1.4.1/system-config-printer.py.utf8-978970 system-config-printer-1.4.1/system-config-printer.py
--- system-config-printer-1.4.1/system-config-printer.py.utf8-978970 2013-07-02 12:51:32.083930404 +0100
+++ system-config-printer-1.4.1/system-config-printer.py 2013-07-02 12:53:25.668419559 +0100
@@ -1324,7 +1324,7 @@ class GUI(GtkGUI):
self.rename_entry_sigids.append ((editable, id))
def printer_name_editing (self, entry):
- newname = origname = unicode (entry.get_text())
+ newname = origname = entry.get_text().decode ('utf-8')
newname = newname.replace("/", "")
newname = newname.replace("#", "")
newname = newname.replace(" ", "")

View File

@ -6,7 +6,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.5.4
Version: 1.5.5
Release: 1%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
@ -29,7 +29,6 @@ Requires: desktop-file-utils >= 0.2.92
Requires: dbus-x11
Requires: python3-dbus%{?_isa}
Requires: system-config-printer-libs = %{version}-%{release}
Requires: gnome-icon-theme
Requires: desktop-notification-daemon
Requires: libnotify%{?_isa}
Requires: libgnome-keyring%{?_isa}
@ -51,6 +50,7 @@ Requires: gobject-introspection
Requires: python3-gobject
Requires: gtk3
Requires: python3-dbus
Requires: python3-requests
BuildArch: noarch
Obsoletes: %{name}-libs < 1.3.12-10
@ -181,6 +181,14 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
* Fri Feb 6 2015 Tim Waugh <twaugh@redhat.com> - 1.5.5-1
- 1.5.5:
- No longer requires gnome-icon-theme (bug #1163928).
- Fixed race condition when fetching devices (bug #1176443).
- Fixed typo preventing retrieve/reprint from working.
- Driver installation fixes.
- Various other fixes.
* Tue Nov 4 2014 Tim Waugh <twaugh@redhat.com> - 1.5.4-1
- 1.5.4:
- Extract hostname from hp:/net/...?hostname= URIs when grouping by