Reverted last change as it did not fix the problem.

This commit is contained in:
Tim Waugh 2013-11-08 16:45:04 +00:00
parent 341c0b437c
commit 1d9c75fafb
2 changed files with 3 additions and 16 deletions

View File

@ -1,12 +0,0 @@
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')

View File

@ -8,7 +8,6 @@ Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-decorator.patch Patch2: system-config-printer-decorator.patch
Patch3: system-config-printer-utf8.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
@ -73,9 +72,6 @@ printers.
# Fixed typo in D-Bus signature decorator (bug #1023449). # Fixed typo in D-Bus signature decorator (bug #1023449).
%patch2 -p1 -b .decorator %patch2 -p1 -b .decorator
# Fixed encoding issue (bug #1023968).
%patch3 -p1 -b .utf8
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -175,6 +171,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0 exit 0
%changelog %changelog
* Fri Nov 8 2013 Tim Waugh <twaugh@redhat.com>
- Reverted last change as it did not fix the problem.
* Wed Oct 30 2013 Tim Waugh <twaugh@redhat.com> 1.4.3-3 * Wed Oct 30 2013 Tim Waugh <twaugh@redhat.com> 1.4.3-3
- Fixed encoding issue (bug #1023968). - Fixed encoding issue (bug #1023968).