[apache-commons-daemon] - add back support for secondary arches (s390x, ppc64)

[Dan Horák]

commit 333157151950567bd47b308e37ce55766c681471
Author: Dan Horák <dan at danny.cz>
Date:   Thu Sep 26 15:13:12 2013 +0200

    - add back support for secondary arches (s390x, ppc64)

 apache-commons-daemon-secondary.patch |   42 +++++++++++++++++++++++++++++++++
 apache-commons-daemon.spec            |    8 +++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-daemon-secondary.patch b/apache-commons-daemon-secondary.patch
new file mode 100644
index 0000000..dff3448
--- /dev/null
+++ b/apache-commons-daemon-secondary.patch
@@ -0,0 +1,42 @@
+diff -up commons-daemon-1.0.15-src/src/native/unix/configure.secondary commons-daemon-1.0.15-src/src/native/unix/configure
+--- commons-daemon-1.0.15-src/src/native/unix/configure.secondary	2013-09-26 14:58:41.000000000 +0200
++++ commons-daemon-1.0.15-src/src/native/unix/configure	2013-09-26 14:58:59.000000000 +0200
+@@ -2610,7 +2610,7 @@ echo "$as_me: error: Unsupported operati
+     ;;
+   esac
+   case $host_cpu in
+-  powerpc)
++  powerpc*)
+     CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+     HOST_CPU=$host_cpu
+     ;;
+@@ -2687,7 +2687,7 @@ echo "$as_me: error: Unsupported operati
+         HOST_CPU=ia64
+     fi
+     ;;
+-  s390)
++  s390 | s390x)
+     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+     supported_os="s390"
+     HOST_CPU=s390
+diff -up commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
+--- commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary	2013-03-27 09:09:02.000000000 +0100
++++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4	2013-09-26 14:57:54.000000000 +0200
+@@ -79,7 +79,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+     ;;
+   esac
+   case $host_cpu in
+-  powerpc)
++  powerpc*)
+     CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+     HOST_CPU=$host_cpu
+     ;;
+@@ -156,7 +156,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+         HOST_CPU=ia64
+     fi
+     ;;
+-  s390)
++  s390 | s390x)
+     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+     supported_os="s390"
+     HOST_CPU=s390
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index a18f176..a3d12e0 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,13 +4,15 @@
 
 Name:           apache-%{short_name}
 Version:        1.0.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Patch1:         apache-commons-daemon-JAVA_OS.patch
+# backport from https://fisheye6.atlassian.com/changelog/commons?cs=1458896
+Patch2:         apache-commons-daemon-secondary.patch
 BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
@@ -58,6 +60,7 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 1:1.0.1
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch1 -p1 -b .java_os
+%patch2 -p1 -b .secondary
 
 # remove java binaries from sources
 rm -rf src/samples/build/
@@ -107,6 +110,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
 
 
 %changelog
+* Thu Sep 26 2013 Dan Horák <dan[at]danny.cz> - 1.0.15-4
+- add back support for secondary arches (s390x, ppc64)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild