From 14600e2affe7fa0b42550802b07533fc00fbd6d2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 10 2018 05:13:31 +0000
Subject: import apache-commons-daemon-1.0.13-7.el7


---

diff --git a/SOURCES/apache-commons-daemon-ppc64.patch b/SOURCES/apache-commons-daemon-ppc64.patch
index 6fdc19a..1419e9c 100644
--- a/SOURCES/apache-commons-daemon-ppc64.patch
+++ b/SOURCES/apache-commons-daemon-ppc64.patch
@@ -1,24 +1,40 @@
 diff -up commons-daemon-1.0.10-src/src/native/unix/configure.ppc64 commons-daemon-1.0.10-src/src/native/unix/configure
---- commons-daemon-1.0.10-src/src/native/unix/configure.ppc64	2012-08-17 15:50:17.060069518 +0200
-+++ commons-daemon-1.0.10-src/src/native/unix/configure	2012-08-17 15:51:23.540069517 +0200
-@@ -2607,7 +2607,7 @@ echo "$as_me: error: Unsupported operati
-     ;;
+--- commons-daemon-1.0.10-src/src/native/unix/configure.ppc64  2012-08-17 15:50:17.060069518 +0200
++++ commons-daemon-1.0.10-src/src/native/unix/configure        2012-08-17 15:51:23.540069517 +0200
+@@ -2566,8 +2566,14 @@ echo "$as_me: error: Unsupported operati
    esac
    case $host_cpu in
--  powerpc)
-+  powerpc*)
+   powerpc)
+-    CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+-    HOST_CPU=$host_cpu;;
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
++    HOST_CPU=ppc;;
++  powerpc64)
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\""
++    HOST_CPU=ppc64;;
++  powerpc64le)
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\""
++    HOST_CPU=ppc64le;;
+   sparc*)
      CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
      HOST_CPU=$host_cpu;;
-   sparc*)
 diff -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.ppc64 commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
---- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.ppc64	2012-08-17 15:50:30.330069517 +0200
-+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4	2012-08-17 15:51:33.280069517 +0200
-@@ -76,7 +76,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
-     ;;
+--- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.ppc64       2012-08-17 15:50:30.330069517 +0200
++++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4     2012-08-17 15:51:33.280069517 +0200
+@@ -77,8 +77,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
    esac
    case $host_cpu in
--  powerpc)
-+  powerpc*)
+   powerpc)
+-    CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+-    HOST_CPU=$host_cpu;;
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
++    HOST_CPU=ppc;;
++  powerpc64)
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\""
++    HOST_CPU=ppc64;;
++  powerpc64le)
++    CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\""
++    HOST_CPU=ppc64le;;
+   sparc*)
      CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
      HOST_CPU=$host_cpu;;
-   sparc*)
diff --git a/SPECS/apache-commons-daemon.spec b/SPECS/apache-commons-daemon.spec
index 3e836e5..0caea2d 100644
--- a/SPECS/apache-commons-daemon.spec
+++ b/SPECS/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.0.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
@@ -115,6 +115,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
 
 
 %changelog
+* Wed Aug 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.13-7
+- Correct host-cpu values on PowerPC
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.0.13-6
 - Mass rebuild 2014-01-24