[nar-maven-plugin/f20] Fixed (hopefully) ARM support

[Marek Goldmann]

commit e3b554f4027f51afd68d077b4368137d1c8a92f4
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Fri Jan 24 13:32:22 2014 +0100

    Fixed (hopefully) ARM support

 0002-Added-ARM-support.patch |   26 +++++++++++++++++++-------
 nar-maven-plugin.spec        |    5 ++++-
 2 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/0002-Added-ARM-support.patch b/0002-Added-ARM-support.patch
index 7f4429a..4c9bc0c 100644
--- a/0002-Added-ARM-support.patch
+++ b/0002-Added-ARM-support.patch
@@ -1,17 +1,17 @@
-From 5d8bbcac10b7ab8c8baf9059b564528d29d003a2 Mon Sep 17 00:00:00 2001
+From ed87d3fe461f2e8259ce399cacde39fa723a0821 Mon Sep 17 00:00:00 2001
 From: Marek Goldmann <marek.goldmann at gmail.com>
 Date: Fri, 10 Jan 2014 10:10:38 +0100
 Subject: [PATCH] Added ARM support
 
 ---
- .../resources/com/github/maven_nar/aol.properties  | 28 ++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
+ .../resources/com/github/maven_nar/aol.properties  | 40 ++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
 
 diff --git a/src/main/resources/com/github/maven_nar/aol.properties b/src/main/resources/com/github/maven_nar/aol.properties
-index 024e768..2c7cb6a 100644
+index 024e768..7a7c423 100644
 --- a/src/main/resources/com/github/maven_nar/aol.properties
 +++ b/src/main/resources/com/github/maven_nar/aol.properties
-@@ -560,6 +560,34 @@ amd64.Linux.gcc.jni.extension=so
+@@ -560,6 +560,46 @@ amd64.Linux.gcc.jni.extension=so
  #amd64.Linux.gpp.arch.includes=lib/**/*.a lib/**/*.so
  
  #
@@ -23,9 +23,15 @@ index 024e768..2c7cb6a 100644
 +arm.Linux.gpp.cpp.compiler=g++
 +arm.Linux.gpp.cpp.defines=ARM LINUX
 +arm.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
-+arm.Linux.gpp.cpp.includes=
++arm.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
 +arm.Linux.gpp.cpp.excludes=
 +
++arm.Linux.gpp.c.compiler=gcc
++arm.Linux.gpp.c.defines=ARM LINUX
++arm.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++arm.Linux.gpp.c.includes=**/*.c
++arm.Linux.gpp.c.excludes=
++
 +# options for gcc linker front end
 +arm.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
 +arm.Linux.gpp.linker.sysLibs=stdc++
@@ -42,10 +48,16 @@ index 024e768..2c7cb6a 100644
 +arm.Linux.gpp.jni.extension=so
 +arm.Linux.gpp.executable.extension=
 +
++# FIXME to be removed when NAR-6
++arm.Linux.gcc.static.extension=a
++arm.Linux.gcc.shared.extension=so*
++arm.Linux.gcc.plugin.extension=so
++arm.Linux.gcc.jni.extension=so
++
 +#
  # MacOSX ("Mac OS X" => MacOSX) PowerPC
  #
  ppc.MacOSX.linker=g++
 -- 
-1.8.4.2
+1.8.5.3
 
diff --git a/nar-maven-plugin.spec b/nar-maven-plugin.spec
index 77ea5ac..6635b59 100644
--- a/nar-maven-plugin.spec
+++ b/nar-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:             nar-maven-plugin
 Version:          3.0.0
-Release:          3%{dist}
+Release:          4%{dist}
 Summary:          Native ARchive plugin for Maven
 License:          ASL 2.0 and LGPLv2
 URL:              https://github.com/maven-nar/nar-maven-plugin/
@@ -69,6 +69,9 @@ rm src/main/java/com/github/maven_nar/NarIntegrationTestMojo.java
 %doc README.md LICENSE-2.0.txt
 
 %changelog
+* Fri Jan 24 2014 Marek Goldmann <mgoldman at redhat.com> - 3.0.0-4
+- Fixed (hopefully) ARM support
+
 * Tue Jan 21 2014 Marek Goldmann <mgoldman at redhat.com> - 3.0.0-3
 - Add support for handling the $RPM_OPT_FLAGS variable, RHBZ#1056049