From 086fbfb4f0d4cc3c12e2ecd1c2a7afba7cf547ee Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Dec 01 2011 01:28:56 +0000
Subject: add patch from upstream for arm hardware floating point support


---

diff --git a/yum-arm-hfp-support.patch b/yum-arm-hfp-support.patch
new file mode 100644
index 0000000..992ebc7
--- /dev/null
+++ b/yum-arm-hfp-support.patch
@@ -0,0 +1,54 @@
+diff -uNr yum-3.4.3-orig/rpmUtils/arch.py yum-3.4.3/rpmUtils/arch.py
+--- yum-3.4.3-orig/rpmUtils/arch.py	2011-11-30 19:24:32.000000000 -0600
++++ yum-3.4.3/rpmUtils/arch.py	2011-11-30 19:24:58.000000000 -0600
+@@ -2,6 +2,7 @@
+ #
+ 
+ import os
++import rpm
+ 
+ _ppc64_native_is_best = True
+ 
+@@ -65,6 +66,10 @@
+     "armv5tejl": "armv5tel",
+     "armv5tel": "noarch",
+ 
++    #arm hardware floating point
++    "armv7hnl": "armv7hl",
++    "armv7hl": "noarch",
++
+     # super-h 
+     "sh4a": "sh4",
+     "sh4": "noarch",
+@@ -235,6 +240,13 @@
+ 
+     return arch
+ 
++def getCanonARMArch(arch):
++    # the %{_target_arch} macro in rpm will let us know the abi we are using 
++    target = rpm.expandMacro('%{_target_cpu}')
++    if target.startswith('armv7h'):
++        return target
++    return arch
++
+ def getCanonPPCArch(arch):
+     # FIXME: should I do better handling for mac, etc?
+     if arch != "ppc64":
+@@ -312,6 +324,8 @@
+     if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"):
+         return getCanonX86Arch(arch)
+ 
++    if arch.startswith("arm"):
++        return getCanonARMArch(arch)
+     if arch.startswith("ppc"):
+         return getCanonPPCArch(arch)
+     if arch.startswith("sparc"):
+@@ -363,6 +377,8 @@
+         return "sparc"
+     elif myarch.startswith("ppc64") and not _ppc64_native_is_best:
+         return "ppc"
++    elif myarch.startswith("armv7h"):
++        return "armhfp"
+     elif myarch.startswith("arm"):
+         return "arm"
+         
diff --git a/yum.spec b/yum.spec
index 0fbcbf1..900472b 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -31,6 +31,7 @@ Patch4: no-more-exactarchlist.patch
 Patch5: geode-arch.patch
 Patch6: yum-HEAD.patch
 Patch7: yum-ppc64-preferred.patch
+Patch8: yum-arm-hfp-support.patch
 Patch20: yum-manpage-files.patch
 
 URL: http://yum.baseurl.org/
@@ -142,6 +143,7 @@ Install this package if you want auto yum updates nightly via cron.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %patch20 -p1
 
 %build
@@ -316,6 +318,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Nov 30 2011 Dennis Gilmore <dennis@ausil.us> - 3.4.3-13
+- add patch from upstream for arm hardware floating point support
+
 * Mon Oct 17 2011 James Antill <james at fedoraproject.org> - 3.4.3-12
 - update to latest HEAD
 - Basically just an update for transifex sync.