[yum/f15] Fix libc consolidate. Resolves: bug#715108

[James Antill]

commit 3c03ef1d703468f1fadab7325f97f135e7584511
Author: James Antill <james at and.org>
Date:   Mon Jul 11 17:23:09 2011 -0400

    Fix libc consolidate.
    Resolves: bug#715108

 BZ-701744-collapse-libc.patch |   20 ++++++++++++++++++++
 yum.spec                      |    4 ++++
 2 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/BZ-701744-collapse-libc.patch b/BZ-701744-collapse-libc.patch
index b149c45..98a1d49 100644
--- a/BZ-701744-collapse-libc.patch
+++ b/BZ-701744-collapse-libc.patch
@@ -76,3 +76,23 @@ index e745a1a..95c50a1 100644
                      best = rest.pop()
                  newlist = []
                  for i in mylist:
+commit 5f99d07ffc01a7d5f39c62153efd6f48691c911d
+Author: Seth Vidal <skvidal at fedoraproject.org>
+Date:   Tue Jun 21 14:04:36 2011 -0400
+
+    add check to make sure rest in the libc collapsing is not a single item
+    list.
+
+diff --git a/yum/packages.py b/yum/packages.py
+index d8043f9..5ef9951 100644
+--- a/yum/packages.py
++++ b/yum/packages.py
+@@ -1186,7 +1186,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
+             if libc_requires:
+                 rest = sorted(libc_requires, cmp=compareVerOnly, key=itemgetter(0))
+                 best = rest.pop()
+-                if best[0].startswith('libc.so.6()'): # rpmvercmp will sort this one as 'highest' so we need to remove it from the list
++                if len(rest) > 0 and best[0].startswith('libc.so.6()'): # rpmvercmp will sort this one as 'highest' so we need to remove it from the list
+                     best = rest.pop()
+                 newlist = []
+                 for i in mylist:
diff --git a/yum.spec b/yum.spec
index 4c1b335..6df02a6 100644
--- a/yum.spec
+++ b/yum.spec
@@ -254,6 +254,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Jul 11 2011 James Antill <james at fedoraproject.org> - 3.2.29-7
+- Fix libc consolidate.
+- Resolves: bug#715108
+
 * Tue May 31 2011 James Antill <james at fedoraproject.org> - 3.2.29-6
 - Change arm basearch to arm.