[yum/f17] update to latest HEAD.
James Antill
james at fedoraproject.org
Fri Jun 8 15:26:00 UTC 2012
commit da4c0cf65ac469bbee5b2eb61ec3dc9300609a76
Author: James Antill <james at and.org>
Date: Fri Jun 8 11:25:43 2012 -0400
update to latest HEAD.
- Fix for ppc64p7 detection.
yum-HEAD.patch | 11 ++++++++++-
yum.spec | 6 +++++-
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 1d38d0a..de0e1fc 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -148045,7 +148045,7 @@ index 704a726..05fe6bf 100644
-
-
diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
-index 6082005..2226dc5 100644
+index 6082005..d560be0 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -2,6 +2,11 @@
@@ -148105,6 +148105,15 @@ index 6082005..2226dc5 100644
def legitMultiArchesInSameLib(arch=None):
# this is completely crackrock - if anyone has a better way I
# am all ears
+@@ -80,7 +102,7 @@ def legitMultiArchesInSameLib(arch=None):
+
+ results = [arch]
+
+- if arch == 'x86_64' or arch.startswith('sparcv9'):
++ if arch in ('x86_64', 'ppc64') or arch.startswith('sparcv9'):
+ for (k, v) in arches.items():
+ if v == arch:
+ results.append(k)
@@ -210,6 +232,32 @@ def _try_read_cpuinfo():
except:
return []
diff --git a/yum.spec b/yum.spec
index 5ad02fe..9dfe3af 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 26%{?dist}
+Release: 27%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -313,6 +313,10 @@ exit 0
%endif
%changelog
+* Fri Jun 8 2012 James Antill <james at fedoraproject.org> - 3.4.3-27
+- update to latest HEAD.
+- Fix for ppc64p7 detection.
+
* Thu Jun 7 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-26
- update to latest HEAD
- more completion helper patches
More information about the scm-commits
mailing list