rpms/PackageKit/F-9 pk-dont-stop-at-first-package.patch, NONE, 1.1 PackageKit.spec, 1.49, 1.50

Richard Hughes rhughes at fedoraproject.org
Wed Aug 27 12:59:56 UTC 2008


Author: rhughes

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

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-stop-at-first-package.patch 
Log Message:
* Wed Aug 27 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-7
- Fix resolving 64 bit packages on multiarch machines.
- Fixes rh#447957


pk-dont-stop-at-first-package.patch:

--- NEW FILE pk-dont-stop-at-first-package.patch ---
commit 065caf0fe65ec143e18972400405ca407354afb4
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Aug 27 13:48:48 2008 +0100

    yum: don't always prefer the first package returned from returnNewestByNameArch() as this will be i386 on x64

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 1186231..e8e7b95 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -920,7 +920,6 @@ class PackageKitYumBackend(PackageKitBaseBackend):
                             show = False
                     if show:
                         self._show_package(pkg,INFO_AVAILABLE)
-                        break
 
     @handle_repo_error
     def install_packages(self,package_ids):


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PackageKit.spec	27 Aug 2008 10:04:21 -0000	1.49
+++ PackageKit.spec	27 Aug 2008 12:59:26 -0000	1.50
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.2.4
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -27,6 +27,8 @@
 Patch4:    pk-dont-blacklist-apostrophes.patch
 # upstream, d7eb3b7b4c8af84d82c42a727d08bc4adf722d6d
 Patch5:    pk-handle-restart-x64.patch
+# upstream, 065caf0fe65ec143e18972400405ca407354afb4
+Patch6:    pk-dont-stop-at-first-package.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -116,6 +118,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
@@ -212,6 +215,10 @@
 %{_includedir}/*
 
 %changelog
+* Wed Aug 27 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-7
+- Fix resolving 64 bit packages on multiarch machines.
+- Fixes rh#447957
+
 * Wed Aug 27 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.4-6
 - Dont crash 64 bit client tools when the daemon exits.
 - Fixes rh#458215




More information about the fedora-extras-commits mailing list