commit 341c0b437c02dc09a59c7f56e24dd4710341d049
Author: Tim Waugh <twaugh at redhat.com>
Date: Wed Oct 30 17:27:38 2013 +0000
Fixed encoding issue (bug #1023968).
Resolves: rhbz#1023968
system-config-printer-utf8.patch | 12 ++++++++++++
system-config-printer.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/system-config-printer-utf8.patch b/system-config-printer-utf8.patch
new file mode 100644
index 0000000..e46f257
--- /dev/null
+++ b/system-config-printer-utf8.patch
@@ -0,0 +1,12 @@
+diff -up system-config-printer-1.4.3/applet.py.utf8 system-config-printer-1.4.3/applet.py
+--- system-config-printer-1.4.3/applet.py.utf8 2013-07-22 14:58:32.000000000 +0100
++++ system-config-printer-1.4.3/applet.py 2013-10-30 17:26:40.606867609 +0000
+@@ -117,7 +117,7 @@ class NewPrinterNotification(dbus.servic
+ device = "%s %s" % (mfg, mdl)
+ else:
+ device = des
+- text = _("No printer driver for %s.") % device
++ text = _("No printer driver for %s.").decode ('utf-8') % device
+ else:
+ text = _("No driver for this printer.")
+ n = Notify.Notification.new (title, text, 'printer')
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 431f523..aa94444 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,13 +1,14 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?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-decorator.patch
+Patch3: system-config-printer-utf8.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@@ -72,6 +73,9 @@ printers.
# Fixed typo in D-Bus signature decorator (bug #1023449).
%patch2 -p1 -b .decorator
+# Fixed encoding issue (bug #1023968).
+%patch3 -p1 -b .utf8
+
%build
%configure --with-udev-rules
@@ -171,6 +175,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
+* Wed Oct 30 2013 Tim Waugh <twaugh at redhat.com> 1.4.3-3
+- Fixed encoding issue (bug #1023968).
+
* Fri Oct 25 2013 Tim Waugh <twaugh at redhat.com> 1.4.3-2
- Fixed typo in D-Bus signature decorator (bug #1023449).