rpms/PackageKit/F-11 PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch, NONE, 1.1 PackageKit-0.4.6-Presto-handle-downloading-updates.patch, 1.2, 1.3 PackageKit.spec, 1.105, 1.106

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914

Modified Files:
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch 
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch 
Log Message:
* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-8
- Backport a patch from upstream to stop refresh-packagekit from running
  when the script is running under PackageKit. This fixes the bug where
  the update icon displays the wrong number of updates if all the updates
  are applied, and only affects the yum backend.
- The full problem and solution is described in #492005


PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch:

--- NEW FILE PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch ---
commit 5c3396990ea6e973b239a168828c4ad64c58e91b
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Apr 24 09:45:55 2009 +0100

    yum: disable the refresh-packagekit plugin when running under PackageKit

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index f5ea431..457b36b 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2791,6 +2791,16 @@ class PackageKitYumBase(yum.YumBase):
 
     def __init__(self, backend):
         yum.YumBase.__init__(self)
+
+        # disable the PackageKit plugin when running under PackageKit
+        try:
+            pc = self.preconf
+            pc.disabled_plugins = ['refresh-packagekit']
+        except yum.Errors.ConfigError, e:
+            raise PkError(ERROR_REPO_CONFIGURATION_ERROR, _to_unicode(e))
+        except ValueError, e:
+            raise PkError(ERROR_FAILED_CONFIG_PARSING, _to_unicode(e))
+
         self.missingGPGKey = None
         self.dsCallback = DepSolveCallback(backend)
         self.backend = backend

PackageKit-0.4.6-Presto-handle-downloading-updates.patch:

Index: PackageKit-0.4.6-Presto-handle-downloading-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit-0.4.6-Presto-handle-downloading-updates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PackageKit-0.4.6-Presto-handle-downloading-updates.patch	21 Apr 2009 10:19:55 -0000	1.2
+++ PackageKit-0.4.6-Presto-handle-downloading-updates.patch	24 Apr 2009 09:18:00 -0000	1.3
@@ -24,7 +24,7 @@
 +        #  - gnote-0.1.2-2.fc11.i586.rpm
 +        # and for Presto:
 +        #  - gnote-0.1.1-4.fc11_0.1.2-2.fc11.i586.drpm
-+        sections = name.rsplit('-', 3)
++        sections = name.rsplit('-', 2)
 +        if len(sections) < 3:
 +            return None
 +


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- PackageKit.spec	23 Apr 2009 11:29:06 -0000	1.105
+++ PackageKit.spec	24 Apr 2009 09:18:00 -0000	1.106
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -54,6 +54,9 @@
 # Already upstream: 33894239b42dcb6069ab3a99e3cb47667448d499..a782056c337562594155a9405adcd9d5e65be32d
 Patch11:   PackageKit-0.4.6-yum-dont-allow-SIGKILL.patch
 
+# Already upstream: 5c3396990ea6e973b239a168828c4ad64c58e91b
+Patch12:   PackageKit-0.4.6-dont-run-pkplugin-under-pk.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -264,6 +267,7 @@
 %patch9 -p1 -b .presto-downloading-updates
 %patch10 -p1 -b .send-package-finished
 %patch11 -p1 -b .disallow-sigkill
+%patch12 -p1 -b .no-plugin-under-pk
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -458,9 +462,16 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Fri Apr 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-8
+- Backport a patch from upstream to stop refresh-packagekit from running
+  when the script is running under PackageKit. This fixes the bug where
+  the update icon displays the wrong number of updates if all the updates
+  are applied, and only affects the yum backend.
+- The full problem and solution is described in #492005
+
 * Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-7
 - Backport a patch from upstream to disallow SIGKILL when using the yum
-  backend. This is recommended by Panu.
+  backend. This is recommended by Panu. Should fix #495087
 
 * Wed Apr 22 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-6
 - Send ::Package(finished) when we've finished downloading a file rather than