[PackageKit/f14/master] * Wed Jan 12 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.11-2 - Backport: yum: Ensure the categ

[Kevin Kofler]

commit b700efeef7268720a3a7082587528a482b4713d8
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Jan 12 07:51:18 2011 +0100

    * Wed Jan 12 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.11-2
    - Backport: yum: Ensure the category data is valid UTF8 (rhughes, #668282)

 PackageKit-0.6.11-yum-UTF-8.patch |   13 +++++++++++++
 PackageKit.spec                   |   13 ++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit-0.6.11-yum-UTF-8.patch b/PackageKit-0.6.11-yum-UTF-8.patch
new file mode 100644
index 0000000..f7659f2
--- /dev/null
+++ b/PackageKit-0.6.11-yum-UTF-8.patch
@@ -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
\ No newline at end of file
diff --git a/PackageKit.spec b/PackageKit.spec
index 991213e..3bca747 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,7 +5,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.11
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
@@ -16,6 +16,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
@@ -227,6 +234,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
 autoconf
@@ -426,6 +434,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Jan 12 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.11-2
+- Backport: yum: Ensure the category data is valid UTF8 (rhughes, #668282)
+
 * Mon Dec 13 2010 Richard Hughes  <rhughes at redhat.com> - 0.6.11-1
 - New upstream release.
 - Many small bugfixes and performance increases.