From be8300f123177ce7834f7ea31e45281a6694beca Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 20 May 2013 14:45:25 +0100 Subject: [PATCH] New upstream release --- .gitignore | 1 + ...ge-is-removed-from-the-sack-properly.patch | 47 ------------------- PackageKit.spec | 15 +++--- sources | 2 +- 4 files changed, 11 insertions(+), 54 deletions(-) delete mode 100644 0001-Ensure-the-package-is-removed-from-the-sack-properly.patch diff --git a/.gitignore b/.gitignore index 564a85d..b4db274 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.8.6.tar.xz /PackageKit-0.8.7.tar.xz /PackageKit-0.8.8.tar.xz +/PackageKit-0.8.9.tar.xz diff --git a/0001-Ensure-the-package-is-removed-from-the-sack-properly.patch b/0001-Ensure-the-package-is-removed-from-the-sack-properly.patch deleted file mode 100644 index e14854e..0000000 --- a/0001-Ensure-the-package-is-removed-from-the-sack-properly.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b5a499ec7c34ea32f4ba379ec2b7cd352fe4c2d3 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Thu, 9 May 2013 15:45:25 +0100 -Subject: [PATCH] Ensure the package is removed from the sack properly - -We have to remove the package from the array itself, and the hash cache. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=960081 ---- - lib/packagekit-glib2/pk-package-sack.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c -index 94d02c3..59e47fb 100644 ---- a/lib/packagekit-glib2/pk-package-sack.c -+++ b/lib/packagekit-glib2/pk-package-sack.c -@@ -445,6 +445,7 @@ pk_package_sack_remove_package (PkPackageSack *sack, PkPackage *package) - g_return_val_if_fail (PK_IS_PACKAGE (package), FALSE); - - /* remove from array */ -+ g_hash_table_remove (sack->priv->table, pk_package_get_id (package)); - ret = g_ptr_array_remove (sack->priv->array, package); - - return ret; -@@ -467,7 +468,6 @@ pk_package_sack_remove_package_by_id (PkPackageSack *sack, - const gchar *package_id) - { - PkPackage *package; -- const gchar *id; - gboolean ret = FALSE; - guint i; - GPtrArray *array; -@@ -478,9 +478,8 @@ pk_package_sack_remove_package_by_id (PkPackageSack *sack, - array = sack->priv->array; - for (i = 0; i < array->len; i++) { - package = g_ptr_array_index (array, i); -- id = pk_package_get_id (package); -- if (g_strcmp0 (package_id, id) == 0) { -- g_ptr_array_remove_index (array, i); -+ if (g_strcmp0 (package_id, pk_package_get_id (package)) == 0) { -+ pk_package_sack_remove_package (sack, package); - ret = TRUE; - break; - } --- -1.8.2.1 - diff --git a/PackageKit.spec b/PackageKit.spec index 44dde28..95ddcbe 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,8 +3,8 @@ Summary: Package management service Name: PackageKit -Version: 0.8.8 -Release: 2%{?dist} +Version: 0.8.9 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -18,9 +18,6 @@ Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch # Upstreamable? allow use of xulrunner2 for browser-plugin support Patch4: PackageKit-0.7.4-xulrunner2.patch -# Upstream -Patch6: 0001-Ensure-the-package-is-removed-from-the-sack-properly.patch - Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info @@ -241,7 +238,6 @@ user to restart the computer or remove and re-insert the device. %patch0 -p1 -b .fedora %patch1 -p1 -b .no-time %patch4 -p1 -b .xulrunner2 -%patch6 -p1 -b .fix-package-sack-removal NOCONFIGURE=1 ./autogen.sh @@ -441,6 +437,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Mon May 20 2013 Richard Hughes - 0.8.9-1 +- New upstream release +- Add 'pkcon backend-details' to be get details of the selected backend +- Do not rely on Python2 to write UTF-8 strings +- Update the comps->group mapping for Fedora 19 +- When converting to unicode special case YumBaseError + * Thu May 09 2013 Richard Hughes - 0.8.8-2 - Backport a patch from master to fix package selection in gnome-packagekit - Resolves: #960081 diff --git a/sources b/sources index e6f7751..fec6f54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29d3dee9cb75923e5a66c7aeb07b2ec8 PackageKit-0.8.8.tar.xz +a2f40ba8eab770a1dfadbc937346bfcc PackageKit-0.8.9.tar.xz