[PATCH] Add armv6hl

[Lubomir Rintel]

It has been recently added to RPM. This is functionally equivalent to what
Pidora, the Fedora Remix for Raspberry Pi computer uses apart from that it does
not break all other ARM flavours by forcing them to be armv6hl and switches
the base architecture to armhfp instead of arm which seems more appropriate
for an architecture with vfp extensions.
---
 rpmUtils/arch.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 54fa189..0c6fc0f 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -74,7 +74,8 @@ arches = {
 
     #arm hardware floating point
     "armv7hnl": "armv7hl",
-    "armv7hl": "noarch",
+    "armv7hl": "armv6hl",
+    "armv6hl": "noarch",
 
     # arm64
     "arm64": "noarch",
@@ -288,7 +289,7 @@ def getCanonX86Arch(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'):
+    if target.startswith('armv6h') or target.startswith('armv7h'):
         return target
     return arch
 
@@ -439,7 +440,7 @@ def getBaseArch(myarch=None):
         return "ppc"
     elif myarch.startswith("arm64"):
         return "arm64"
-    elif myarch.startswith("armv7h"):
+    elif myarch.startswith("armv6h") or myarch.startswith("armv7h"):
         return "armhfp"
     elif myarch.startswith("arm"):
         return "arm"
-- 
1.9.3