rpms/PackageKit/devel pk-preupgrade-typo.patch, NONE, 1.1 PackageKit.spec, 1.55, 1.56

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11967

Modified Files:
	PackageKit.spec 
Added Files:
	pk-preupgrade-typo.patch 
Log Message:
* Tue Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-3
- Fix a silly typo where we might upgrade the kernel when we check for
  distro upgrades.


pk-preupgrade-typo.patch:

--- NEW FILE pk-preupgrade-typo.patch ---
commit 0f2fa1f265aa0e7922d5acf03e1266081345df58
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Wed Sep 17 10:28:13 2008 +0100

    yum: bugfix: don't try and upgrade kernel when we want to upgrade the preupgrade package

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index e3f07c1..cfbc17d 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1397,7 +1397,7 @@ class PackageKitYumBackend(PackageKitBaseBackend,PackagekitPackage):
         elif len(pkgs) == 1:
             # check if there are any updates to the preupgrade package
             po = pkgs[0]
-            pkgs = self.yumbase.pkgSack.returnNewestByName(name='kernel')
+            pkgs = self.yumbase.pkgSack.returnNewestByName(name='preupgrade')
             if pkgs:
                 newest = pkgs[0]
                 if newest.EVR > po.EVR:


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PackageKit.spec	16 Sep 2008 18:32:34 -0000	1.55
+++ PackageKit.spec	17 Sep 2008 09:38:16 -0000	1.56
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -18,6 +18,9 @@
 # upstream: 51b020dca500141a6e78ab549765f09a34ac75fc
 Patch0:    pk-upgrades-mistake.patch
 
+# upstream: 0f2fa1f265aa0e7922d5acf03e1266081345df58
+Patch1:    pk-preupgrade-typo.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +277,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 17 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-3
+- Fix a silly typo where we might upgrade the kernel when we check for
+  distro upgrades.
+
 * Tue Sep 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.3-2
 - Fix an error where we didn't connect up the GetDistroUpgrades in
   the new dispatcher code.