* Wed Jan 12 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.6.11-3

- Backport: yum: Ensure the category data is valid UTF8 (rhughes, #668282)
This commit is contained in:
Kevin Kofler 2011-01-12 07:44:30 +01:00
parent d115a7d63b
commit ebfb9ac4a2
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,13 @@
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -999,8 +999,8 @@
# yum >= 3.2.10
# name = cat.nameByLang(self.lang)
# summary = cat.descriptionByLang(self.lang)
- name = cat.name
- summary = cat.description
+ name = _to_unicode(cat.name)
+ summary = _to_unicode(cat.description)
fn = "/usr/share/pixmaps/comps/%s.png" % cat_id
if os.access(fn, os.R_OK):
icon = cat_id

View File

@ -3,7 +3,7 @@
Summary: Package management service
Name: PackageKit
Version: 0.6.11
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
@ -14,6 +14,13 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# Fedora specific: the yum backend doesn't do time estimation correctly
Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
# From upstream:
# http://gitorious.org/packagekit/packagekit/commit/7a92f842830e3ea9122463fe279f0b42150cbd63
# yum: Ensure the category data is valid UTF8
# fixes: [Bug 668282] PackageKit yum backend uses incorrect encoding for dynamic
# category names, makes them show up with '?' characters in KPackageKit
Patch100: PackageKit-0.6.11-yum-UTF-8.patch
Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-yum = %{version}-%{release}
Requires: shared-mime-info
@ -245,6 +252,7 @@ user to restart the computer or remove and re-insert the device.
%setup -q
%patch0 -p1 -b .fedora
%patch1 -p1 -b .no-time
%patch100 -p1 -b .yum-UTF-8
%build
%configure \
@ -455,6 +463,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_includedir}/PackageKit/backend/*.h
%changelog
* Wed Jan 12 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.6.11-3
- Backport: yum: Ensure the category data is valid UTF8 (rhughes, #668282)
* Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> - 0.6.11-2
- Rebuild against newer gtk3