diff --git a/.gitignore b/.gitignore index 0948922..cf8795d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ commons-daemon-1.0.2-src.tar.gz /commons-daemon-1.0.5-src.tar.gz /commons-daemon-1.0.6-src.tar.gz /commons-daemon-1.0.7-src.tar.gz +/commons-daemon-1.0.8-src.tar.gz diff --git a/0002-ppc64-configure.patch b/0002-ppc64-configure.patch deleted file mode 100644 index 49b1fce..0000000 --- a/0002-ppc64-configure.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5a66ed56d4ec20e0df41d0b06f122264ee5811af Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 18 Jan 2011 14:48:05 +0100 -Subject: [PATCH 2/3] ppc64 configure - ---- - src/native/unix/configure | 5 ++++- - src/native/unix/support/config.sub | 12 +++++++++--- - 2 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/native/unix/configure b/src/native/unix/configure -index 64d88bf..1fc9007 100755 ---- a/src/native/unix/configure -+++ b/src/native/unix/configure -@@ -2563,7 +2563,10 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;} - ;; - esac - case $host_cpu in -- powerpc) -+ powerpc*) -+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -+ HOST_CPU=$host_cpu;; -+ ppc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; - sparc*) -diff --git a/src/native/unix/support/config.sub b/src/native/unix/support/config.sub -index 93a3a14..449f3b1 100644 ---- a/src/native/unix/support/config.sub -+++ b/src/native/unix/support/config.sub -@@ -225,7 +225,7 @@ case $basic_machine in - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ -- | powerpc | powerpcle \ -+ | powerpc | powerpc64 | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ -@@ -272,7 +272,8 @@ case $basic_machine in - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ -- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ -+ | powerpc-* | powerpc64-* | powerpcle-* \ -+ | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ - | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ -@@ -718,9 +719,14 @@ case $basic_machine in - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; -+ ppc64) basic_machine=powerpc64-unknown -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ ppc64-*) -+ basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; --- -1.7.6 - diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch deleted file mode 100644 index 08cf4f8..0000000 --- a/0003-s390x-configure.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a4541056cfa275aabb9c57f0fab1ea93bb94c1f2 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Wed, 20 Jul 2011 11:08:48 +0200 -Subject: [PATCH 3/3] s390x configure - ---- - src/native/unix/configure | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/native/unix/configure b/src/native/unix/configure -index 1fc9007..15a74c6 100755 ---- a/src/native/unix/configure -+++ b/src/native/unix/configure -@@ -2609,10 +2609,9 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;} - CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" - supported_os="ia64" - HOST_CPU=ia64;; -- s390) -- CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" -- supported_os="s390" -- HOST_CPU=s390;; -+ s390*) -+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -+ HOST_CPU=$host_cpu;; - arm*) - CFLAGS="$CFLAGS -DCPU=\\\"arm\\\"" - supported_os="arm" --- -1.7.6 - diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 9f251ee..bda84d2 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,16 +3,14 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.0.8 +Release: 1%{?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 Patch0: 0001-execve-path-warning.patch -Patch1: 0002-ppc64-configure.patch -Patch2: 0003-s390x-configure.patch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: maven @@ -63,8 +61,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1 %prep %setup -q -n %{short_name}-%{version}-src %patch0 -p1 -b .execve -%patch1 -p1 -b .ppc -%patch2 -p1 -b .s390 # remove java binaries from sources rm -rf src/samples/build/ @@ -136,6 +132,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Thu Jan 26 2012 Stanislav Ochotnicky - 1.0.8-1 +- Update to latest upstream (1.0.8) +- Drop s390/ppc patches (upstream seems to already include them) + * Thu Jan 12 2012 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 601f474..2f686d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb6c5e7b6544fd8400b08f0e81fc9581 commons-daemon-1.0.7-src.tar.gz +323a0bd9e2786256f02c5aed4e887fed commons-daemon-1.0.8-src.tar.gz