Fixed codec issue (bug #984167).

Resolves: rhbz#984167
This commit is contained in:
Tim Waugh 2014-04-16 11:33:23 +01:00
parent 8595c61d9b
commit c2c3f5e90b
2 changed files with 20 additions and 1 deletions

12
hplip-codec.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hplip-3.14.4/base/utils.py.codec hplip-3.14.4/base/utils.py
--- hplip-3.14.4/base/utils.py.codec 2014-04-16 11:30:46.409807494 +0100
+++ hplip-3.14.4/base/utils.py 2014-04-16 11:31:43.947158693 +0100
@@ -463,7 +463,7 @@ def sort_dict_by_value(d):
def commafy(val):
- return locale.format("%d", val, grouping=True).decode(locale.getpreferredencoding())
+ return locale.format("%d", val, grouping=True).decode(locale.getlocale(locale.LC_NUMERIC()[1]))
def format_bytes(s, show_bytes=False):

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.14.4
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and MIT
Url: http://hplip.sourceforge.net/
@ -30,6 +30,7 @@ Patch13: hplip-bad-low-ink-warning.patch
Patch14: hplip-deviceIDs-ppd.patch
Patch15: hplip-ppd-ImageableArea.patch
Patch16: hplip-scan-tmp.patch
Patch17: hplip-codec.patch
%global hpijs_epoch 1
Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
@ -234,6 +235,9 @@ done
# Scan to /var/tmp instead of /tmp (bug #1076954).
%patch16 -p1 -b .scan-tmp
# Fixed codec issue (bug #984167).
%patch17 -p1 -b .codec
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -470,6 +474,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Wed Apr 16 2014 Tim Waugh <twaugh@redhat.com> - 3.14.4-2
- Fixed codec issue (bug #984167).
* Wed Apr 09 2014 Jiri Popelka <jpopelka@redhat.com> - 3.14.4-1
- 3.14.4