rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed typo introduced in previous change and fixed another UTF-8 encoding issue (bug #965771).

Browse Source
This commit is contained in:
Tim Waugh 2013-05-22 09:04:35 +01:00
parent 9425c5d404
commit 120f8baa6a
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system-config-printer-utf8-962207.patch
View File

@ -15,7 +15,7 @@ diff -up system-config-printer-1.4.1/newprinter.py.utf8-962207 system-config-pri
except UnicodeDecodeError:
allowed_chars = unicode (allowed_chars)
- origtext = unicode (entry.get_text())
+ origtext = unicode (entry.get_text(). locale.getpreferredencoding ())
+ origtext = unicode (entry.get_text(), locale.getpreferredencoding ())
new_text = origtext
for char in origtext:
if char not in allowed_chars:

12
system-config-printer-utf8-965771.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.4.1/asyncpk1.py.utf8-965771 system-config-printer-1.4.1/asyncpk1.py
--- system-config-printer-1.4.1/asyncpk1.py.utf8-965771 2013-05-09 12:10:43.000000000 +0100
+++ system-config-printer-1.4.1/asyncpk1.py 2013-05-22 09:01:14.216632448 +0100
@@ -439,7 +439,7 @@ class PK1Connection:
result_str = dict()
for key, value in dbusdict.iteritems ():
if type (key) == dbus.String:
- result_str[str (key)] = str (value)
+ result_str[unicode (key)] = unicode (value)
else:
result_str[key] = value

12
system-config-printer.spec
View File

@ -1,7 +1,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.4.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -11,7 +11,8 @@ Patch2: system-config-printer-utf8-961882.patch
Patch3: system-config-printer-utf8-962207.patch
Patch4: system-config-printer-utf8-964673.patch
Patch5: system-config-printer-utf8-965578.patch
Patch6: system-config-printer-typo.patch
Patch6: system-config-printer-utf8-965771.patch
Patch7: system-config-printer-typo.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@ -79,9 +80,10 @@ printers.
%patch3 -p1 -b .utf8-962207
%patch4 -p1 -b .utf8-964673
%patch5 -p1 -b .utf8-965578
%patch6 -p1 -b .utf8-965771
# Fixed typo which could cause a traceback (bug #965678).
%patch6 -p1 -b .typo
%patch7 -p1 -b .typo
%build
%configure --with-udev-rules
@ -182,6 +184,10 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
* Wed May 22 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-3
- Fixed typo introduced in previous change (for bug #962207), and
fixed another UTF-8 encoding issue (bug #965771).
* Tue May 21 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-2
- Fixed typo which could cause a traceback (bug #965678).
- Fixes for UTF-8 encoding issues (bug #957444, bug #961882,