From 8ef454b67f0fc503919930e807eb86bec4de59d8 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Aug 25 2016 19:52:34 +0000
Subject: Fix armv7hnl detection (RHBZ #1368238)


Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>

---

diff --git a/0001-util-detect-armv7hnl-properly.patch b/0001-util-detect-armv7hnl-properly.patch
new file mode 100644
index 0000000..708315d
--- /dev/null
+++ b/0001-util-detect-armv7hnl-properly.patch
@@ -0,0 +1,33 @@
+From d74dbb4a6f6531bfb3b354ac2545882d7558a55a Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Thu, 25 Aug 2016 21:49:55 +0200
+Subject: [PATCH] util: detect armv7hnl properly
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ src/util.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index 0e9352c..8e41226 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -136,10 +136,11 @@ hy_detect_arch(char **arch)
+ 	int ret = parse_cpu_flags(&flags, "Features");
+ 	if (ret)
+ 	    return ret;
+-	if (flags & (ARM_NEON | ARM_VFP3))
+-	    strcpy(un.machine, "armv7hnl");
+-	else if (flags & ARM_VFP3)
+-	    strcpy(un.machine, "armv7hl");
++        if (flags & ARM_VFP3)
++            if (flags & ARM_NEON)
++                strcpy(un.machine, "armv7hnl");
++            else
++                strcpy(un.machine, "armv7hl");
+     }
+ #ifdef __MIPSEL__
+     if (!strcmp(un.machine, "mips"))
+-- 
+2.9.3
+
diff --git a/hawkey.spec b/hawkey.spec
index 8d3224a..2e4c422 100644
--- a/hawkey.spec
+++ b/hawkey.spec
@@ -8,7 +8,7 @@
 
 Name:           hawkey
 Version:        0.6.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library providing simplified C and Python API to libsolv
 License:        LGPLv2+
 URL:            https://github.com/rpm-software-management/%{name}
@@ -16,6 +16,7 @@ Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 
 Patch0001:      0001-sack-don-t-raise-error-when-non-existing-arch-is-use.patch
 Patch0002:      0002-Fixes-for-building-with-libsolv-0.6.21-117.patch
+Patch0003:      0001-util-detect-armv7hnl-properly.patch
 
 BuildRequires:  libsolv-devel >= %{libsolv_version}
 BuildRequires:  cmake
@@ -149,6 +150,9 @@ popd
 %endif
 
 %changelog
+* Thu Aug 25 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.6.3-5
+- Fix armv7hnl detection (RHBZ #1368238)
+
 * Tue Aug 09 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.6.3-4
 - Add %%{?system_python_abi}
 - Trim changelog