[yum/f14] Change arm basearch to arm

[James Antill]

commit c512bf733e5fa14955a87541a8480af4d6dc4cfc
Author: James Antill <james at and.org>
Date:   Tue May 31 14:29:55 2011 -0400

    Change arm basearch to arm

 arm-basearch.patch |   19 +++++++++++++++++++
 yum.spec           |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/arm-basearch.patch b/arm-basearch.patch
new file mode 100644
index 0000000..e441b43
--- /dev/null
+++ b/arm-basearch.patch
@@ -0,0 +1,19 @@
+commit 4d587cf37c8976e6f1b2f3b33b181e52190e8eb7
+Author: Dennis Gilmore <dennis at ausil.us>
+Date:   Thu May 26 15:36:32 2011 -0500
+
+    we need to set the basearch on arm hardware to arm.
+
+diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
+index 72cba60..6082005 100644
+--- a/rpmUtils/arch.py
++++ b/rpmUtils/arch.py
+@@ -359,6 +359,8 @@ def getBaseArch(myarch=None):
+         return "sparc"
+     elif myarch.startswith("ppc64"):
+         return "ppc"
++    elif myarch.startswith("arm"):
++        return "arm"
+         
+     if isMultiLibArch(arch=myarch):
+         if myarch in multilibArches:
diff --git a/yum.spec b/yum.spec
index 24cb483..9188a5f 100644
--- a/yum.spec
+++ b/yum.spec
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.28
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Patch1: yum-mirror-priority.patch
 Patch3: yum-multilib-policy-best.patch
 Patch4: no-more-exactarchlist.patch
 Patch5: geode-arch.patch
+Patch51: arm-basearch.patch
 Patch6: yum-HEAD.patch
 Patch7: yum-PK-auto-close-fix.patch
 
@@ -74,6 +75,7 @@ can notify you when they are available via email, syslog or dbus.
 %patch3 -p0
 %patch4 -p0
 %patch5 -p1
+%patch51 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Tue May 31 2011 James Antill <james at fedoraproject.org> - 3.2.28-7
+- Change arm basearch to arm
+
 * Wed May 11 2011 James Antill <james at fedoraproject.org> - 3.2.28-6
 - Update consolidate_libc to fix new version issue.
 - Limit skip-broken to 30 loops, for rel-eng.