From 64e35e0386c2c722d45494c73977d22d175a7cd6 Mon Sep 17 00:00:00 2001
From: Richard Hughes <rhughes@fedoraproject.org>
Date: Wed, 17 Sep 2008 09:38:16 +0000
Subject: [PATCH] - Fix a silly typo where we might upgrade the kernel when we
 check for     distro upgrades.

---
 PackageKit.spec          | 10 +++++++++-
 pk-preupgrade-typo.patch | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pk-preupgrade-typo.patch

diff --git a/PackageKit.spec b/PackageKit.spec
index 0c559e9..2600ef5 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # 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 @@ using PackageKit.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +277,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/*
 
 %changelog
+* Tue Sep 17 2008 Richard Hughes  <rhughes@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@redhat.com> - 0.3.3-2
 - Fix an error where we didn't connect up the GetDistroUpgrades in
   the new dispatcher code.
diff --git a/pk-preupgrade-typo.patch b/pk-preupgrade-typo.patch
new file mode 100644
index 0000000..9946c42
--- /dev/null
+++ b/pk-preupgrade-typo.patch
@@ -0,0 +1,19 @@
+commit 0f2fa1f265aa0e7922d5acf03e1266081345df58
+Author: Richard Hughes <hughsie@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: