From 2f3f5c83b534888654afab5b39dd8f6e453543a9 Mon Sep 17 00:00:00 2001
From: Lubos Kardos <lkardos@redhat.com>
Date: May 19 2016 11:18:47 +0000
Subject: - Use armv7hl isa for all armhfp (armv7h*l) arches

- Resolves: #1326871

---

diff --git a/rpm-4.13.0-armv7hl-isa.patch b/rpm-4.13.0-armv7hl-isa.patch
new file mode 100644
index 0000000..04a41a6
--- /dev/null
+++ b/rpm-4.13.0-armv7hl-isa.patch
@@ -0,0 +1,30 @@
+From 5d5dd569d01300db833e434ff49beb8b22627310 Mon Sep 17 00:00:00 2001
+From: Lubos Kardos <lkardos@redhat.com>
+Date: Thu, 19 May 2016 13:01:58 +0200
+Subject: [PATCH] Use armv7hl isa for all armhfp (armv7h*l) arches (#1326871)
+
+Patch from Dennis Gilmore <dennis@ausil.us>
+---
+ installplatform | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/installplatform b/installplatform
+index 3bcf70c..ebade42 100755
+--- a/installplatform
++++ b/installplatform
+@@ -96,6 +96,12 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
+ 	CANONARCH=${ARCH}
+ 	CANONCOLOR=0
+ 	;;
++    armv7h*)
++	ISANAME=armv7hl
++	ISABITS=32
++	CANONARCH=arm
++	CANONCOLOR=0
++	;;
+     arm*)
+ 	ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
+ 	ISABITS=32
+-- 
+1.9.3
+
diff --git a/rpm.spec b/rpm.spec
index 26a1428..e5baf0f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}34%{?dist}
+Release: %{?snapver:0.%{snapver}.}35%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -82,6 +82,7 @@ Patch126: rpm-4.13.0-no-backup-if-mismatch.patch
 Patch127: rpm-4.13.0-rpmtd-out-of-bounds.patch
 Patch128: rpm-4.13.0-stringFormat-sigsegv.patch
 Patch129: rpm-4.13.0-filter-unversioned.patch
+Patch130: rpm-4.13.0-armv7hl-isa.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -593,6 +594,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Thu May 19 2016 Lubos Kardos <lkardos@redhat.com> 4.13.0-0.rc1.35
+- Use armv7hl isa for all armhfp (armv7h*l) arches (#1326871)
+
 * Tue May 17 2016 Lubos Kardos <lkardos@redhat.com> 4.13.0-0.rc1.34
 - Filter unversioned deps if corresponding versioned deps exist (#678605)