diff --git a/.gitignore b/.gitignore index 7d8f0ab..343e92e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ commons-daemon-1.0.2-src.tar.gz +/commons-daemon-1.0.3-src.tar.gz diff --git a/apache-commons-daemon-execve-path-warning.patch b/apache-commons-daemon-execve-path-warning.patch index f41d726..40cba21 100644 --- a/apache-commons-daemon-execve-path-warning.patch +++ b/apache-commons-daemon-execve-path-warning.patch @@ -1,20 +1,10 @@ -From f1a95250e28d69acf85819ad8a792c39f8b0d393 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 11 May 2010 13:29:15 +0200 -Subject: [PATCH 1/3] Patch to force absolute or relative paths (no PATH searching) - ---- - src/native/unix/native/jsvc-unix.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c -index 6f39365..abbebb7 100644 ---- a/src/native/unix/native/jsvc-unix.c -+++ b/src/native/unix/native/jsvc-unix.c -@@ -702,6 +702,16 @@ int main(int argc, char *argv[]) { - char *p1=NULL; - char *p2=NULL; - +--- src/native/unix/native/jsvc-unix.c 2010-10-22 02:39:31.758471743 +0200 ++++ src/native/unix/native/jsvc-unix.c 2010-10-22 02:41:27.200469664 +0200 +@@ -824,6 +824,16 @@ + char *tmp = NULL; + char *p1 = NULL; + char *p2 = NULL; ++ + /* We don't want to use a form of exec() that searches the + PATH, so require that argv[0] be either an absolute or + relative path. Error out if this isn't the case. */ @@ -24,10 +14,6 @@ index 6f39365..abbebb7 100644 + return(1); + } + -+ + /* * There is no need to change LD_LIBRARY_PATH - * if we were not able to find a path to libjvm.so --- -1.6.6.1 - diff --git a/apache-commons-daemon-s390x-configure.patch b/apache-commons-daemon-s390x-configure.patch index d91a420..acf2ab4 100644 --- a/apache-commons-daemon-s390x-configure.patch +++ b/apache-commons-daemon-s390x-configure.patch @@ -1,17 +1,6 @@ -From 18a2855ac81518c42988feb0a089e2949b246e40 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Wed, 12 May 2010 11:01:31 +0200 -Subject: [PATCH 3/3] Add support for s390x to 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 a9284c0..f7f9b9a 100755 ---- a/src/native/unix/configure -+++ b/src/native/unix/configure -@@ -3025,10 +3025,10 @@ $as_echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;} +--- src/native/unix/configure 2010-10-22 02:50:05.751594395 +0200 ++++ src/native/unix/configure 2010-10-22 02:51:03.501471420 +0200 +@@ -2478,10 +2478,10 @@ CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" supported_os="ia64" HOST_CPU=ia64;; @@ -24,8 +13,5 @@ index a9284c0..f7f9b9a 100755 + supported_os="$host_cpu" + HOST_CPU=$host_cpu;; *) - { $as_echo "$as_me:$LINENO: result: failed" >&5 - $as_echo "failed" >&6; } --- -1.6.6.1 - + echo "$as_me:$LINENO: result: failed" >&5 + echo "${ECHO_T}failed" >&6 diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index d1d512f..8b1d9e8 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,8 +3,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 Group: Applications/System @@ -14,25 +14,23 @@ Patch0: %{name}-execve-path-warning.patch Patch1: %{name}-ppc64-configure.patch Patch2: %{name}-s390x-configure.patch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils >= 0:1.7.2 +BuildRequires: jpackage-utils +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-idea-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-bundle -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-doxia-sitetools -BuildRequires: maven2-plugin-assembly -BuildRequires: maven2-plugin-antrun -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-idea -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-javadoc -BuildRequires: maven2-plugin-resources +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin BuildRequires: xmlto -Requires: java >= 1:1.6.0 -Requires: jpackage-utils >= 0:1.6 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,9 +72,9 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1 %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p1 -b .execve +%patch0 -p0 -b .execve %patch1 -p1 -b .ppc -%patch2 -p1 -b .s390 +%patch2 -p0 -b .s390 chmod 644 src/samples/* cd src/native/unix @@ -166,6 +164,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 22 2010 Chris Spike 1.0.3-1 +- Updated to 1.0.3 +- Cleaned up BRs + * Thu Jul 8 2010 Stanislav Ochotnicky - 1.0.2-4 - Add license to javadoc subpackage diff --git a/sources b/sources index e882fd9..95ce3f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6c68eed204bc9f1ef3b77488edfcfeb commons-daemon-1.0.2-src.tar.gz +d39c01c625df709a4943cd1007b5d834 commons-daemon-1.0.3-src.tar.gz