From 305eda7637a5091fccbaf0da5561d3fdb2de1abe Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mon, 26 Sep 2016 16:15:14 +0200
Subject: [PATCH] Add aarch32 to libarch for arm platform

---
 cmake-libarch-arm-findjni.patch | 12 ++++++++++++
 cmake.spec                      |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 cmake-libarch-arm-findjni.patch

diff --git a/cmake-libarch-arm-findjni.patch b/cmake-libarch-arm-findjni.patch
new file mode 100644
index 0000000..1a93f59
--- /dev/null
+++ b/cmake-libarch-arm-findjni.patch
@@ -0,0 +1,12 @@
+diff -up cmake-3.6.2/Modules/FindJNI.cmake.than cmake-3.6.2/Modules/FindJNI.cmake
+--- cmake-3.6.2/Modules/FindJNI.cmake.than	2016-09-26 16:07:43.486195741 +0200
++++ cmake-3.6.2/Modules/FindJNI.cmake	2016-09-26 16:08:53.239573692 +0200
+@@ -53,7 +53,7 @@ macro(java_append_library_directories _v
+         set(_java_libarch "alpha")
+     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+         # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
+-        set(_java_libarch "arm")
++        set(_java_libarch "arm" "aarch32")
+     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+         # mips* machines are bi-endian mostly so processor does not tell
+         # endianess of the underlying system.
diff --git a/cmake.spec b/cmake.spec
index 3fc87a9..feb9e58 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -43,7 +43,7 @@
 
 Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 # most sources are BSD
@@ -66,7 +66,8 @@ Source4:        %{name}.prov
 Patch2:         %{name}-findruby.patch
 # replace release flag -O3 with -O2 for fedora
 Patch3:         %{name}-fedora-flag_release.patch
-
+# add extra aarch32 to libarch for arm platform
+Patch4:         %{name}-libarch-arm-findjni.patch
 # Patch for renaming on EPEL
 %if 0%{?name_suffix:1}
 Patch1000:      %{name}-rename.patch
@@ -392,6 +393,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Sep 26 2016 Than Ngo <than@redhat.com> - 3.6.2-3
+- Add aarch32 to libarch for arm platform
+
 * Mon Sep 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.6.2-2
 - Provide the major version cmakeX name