diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch index f5806d1..fd3e480 100644 --- a/0003-s390x-configure.patch +++ b/0003-s390x-configure.patch @@ -1,17 +1,7 @@ -From 2c58c04e648f9c956c3c691ff456f9d1c7470ebe Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 18 Jan 2011 14:56:18 +0100 -Subject: [PATCH 3/3] s390x configure - ---- - src/native/unix/configure | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/native/unix/configure b/src/native/unix/configure -index 62f35d9..deac6e3 100755 ---- a/src/native/unix/configure -+++ b/src/native/unix/configure -@@ -3030,10 +3030,10 @@ $as_echo "failed" >&6; } +diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-1.0.5-src/src/native/unix/configure +--- commons-daemon-1.0.5-src/src/native/unix/configure.s390 2011-05-04 16:04:10.000000000 +0200 ++++ commons-daemon-1.0.5-src/src/native/unix/configure 2011-05-04 16:12:04.000000000 +0200 +@@ -3030,10 +3030,9 @@ $as_echo "failed" >&6; } CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" supported_os="ia64" HOST_CPU=ia64;; @@ -21,11 +11,7 @@ index 62f35d9..deac6e3 100755 - HOST_CPU=s390;; + s390*) + CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -+ supported_os="$host_cpu" + HOST_CPU=$host_cpu;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } --- -1.7.3.4 - diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 7164c46..00d29f2 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 Group: Applications/System @@ -148,6 +148,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Wed May 4 2011 Dan HorĂ¡k - 1.0.5-4 +- updated the s390x patch + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild