rpms/yum/F-9 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch, NONE, 1.1 yum.spec, 1.214, 1.215

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/yum/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23127

Modified Files:
	yum.spec 
Added Files:
	0001-Allow-noarch-packages-when-in-multilib_policy-best.patch 
Log Message:
* Tue Jun 24 2008 Jesse Keating <jkeating at redhat.com> - 3.2.16-3
- Add another patch from upstream for multilib policy and noarch


0001-Allow-noarch-packages-when-in-multilib_policy-best.patch:

--- NEW FILE 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch ---
>From b4697ec87b62c00958059cc5119e762b050a3f2e Mon Sep 17 00:00:00 2001
From: James Antill <james at and.org>
Date: Tue, 24 Jun 2008 12:58:11 -0400
Subject: [PATCH] Allow noarch packages when in multilib_policy=best

---
 yum/__init__.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/yum/__init__.py b/yum/__init__.py
index 17f0664..bbf3df8 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2198,8 +2198,10 @@ class YumBase(depsolve.Depsolve):
                            pkgs_by_name = {}
                            use = []
                            not_added = []
+                           best = rpmUtils.arch.legitMultiArchesInSameLib()
+                           best.append('noarch')
                            for pkg in pkgs:
-                               if pkg.arch in rpmUtils.arch.legitMultiArchesInSameLib():
+                               if pkg.arch in best:
                                    pkgs_by_name[pkg.name] = 1    
                                    use.append(pkg)  
                                else:
-- 
1.5.5.2



Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/F-9/yum.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- yum.spec	18 May 2008 14:53:18 -0000	1.214
+++ yum.spec	24 Jun 2008 17:11:35 -0000	1.215
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch2: yum-manpage-files.patch
 Patch3: yum-multilib-policy-best.patch
 Patch4: 0001-gotta-check-both-not-either-otherwise-filedeps-do.patch
+Patch5: 0001-Allow-noarch-packages-when-in-multilib_policy-best.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -57,6 +58,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p1
+%patch5 -p1
 
 %build
 make
@@ -105,6 +107,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Tue Jun 24 2008 Jesse Keating <jkeating at redhat.com> - 3.2.16-3
+- Add another patch from upstream for multilib policy and noarch
+
 * Sun May 18 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.16-2
 - stupid, stupid, stupid