[apache-commons-daemon] Update to latest version (1.0.5)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Jan 18 16:16:48 UTC 2011
commit 7f7e9775dbd14e04bebe0a3116efa5bd16c03128
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Jan 18 15:10:05 2011 +0100
Update to latest version (1.0.5)
- Use maven 3 to build
- Versionless jars & javadocs
.gitignore | 1 +
0001-execve-path-warning.patch | 33 +++++++++++
...4-configure.patch => 0002-ppc64-configure.patch | 12 ++--
0003-s390x-configure.patch | 31 ++++++++++
apache-commons-daemon-execve-path-warning.patch | 19 ------
apache-commons-daemon-s390x-configure.patch | 17 ------
apache-commons-daemon.spec | 61 ++++++++------------
sources | 2 +-
8 files changed, 96 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df52c65..94847a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
commons-daemon-1.0.2-src.tar.gz
/commons-daemon-1.0.3-src.tar.gz
/commons-daemon-1.0.4-src.tar.gz
+/commons-daemon-1.0.5-src.tar.gz
diff --git a/0001-execve-path-warning.patch b/0001-execve-path-warning.patch
new file mode 100644
index 0000000..25504ef
--- /dev/null
+++ b/0001-execve-path-warning.patch
@@ -0,0 +1,33 @@
+From d4ac1b866785a0fd69abca5422b647453e96f7c3 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 18 Jan 2011 14:46:21 +0100
+Subject: [PATCH 1/3] execve path warning
+
+---
+ 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 e3d9e89..7d50ea9 100644
+--- a/src/native/unix/native/jsvc-unix.c
++++ b/src/native/unix/native/jsvc-unix.c
+@@ -966,6 +966,16 @@ int main(int argc, char *argv[])
+ 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. */
++ tmp=strchr(oldpath,'/');
++ if (tmp==NULL) {
++ log_error("JSVC re-exec requires execution with an absolute or relative path");
++ return(1);
++ }
++
+
+ /*
+ * There is no need to change LD_LIBRARY_PATH
+--
+1.7.3.4
+
diff --git a/apache-commons-daemon-ppc64-configure.patch b/0002-ppc64-configure.patch
similarity index 87%
rename from apache-commons-daemon-ppc64-configure.patch
rename to 0002-ppc64-configure.patch
index 7d40192..73aff13 100644
--- a/apache-commons-daemon-ppc64-configure.patch
+++ b/0002-ppc64-configure.patch
@@ -1,7 +1,7 @@
-From 9e535d207d52ed4dd4337e91ffc14068401f3d31 Mon Sep 17 00:00:00 2001
+From 371ed8b175a2b7b05b5c9687b2d7fe7880524cb1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Tue, 11 May 2010 14:05:57 +0200
-Subject: [PATCH 2/3] Add support for 64bin PPC architectures to configure
+Date: Tue, 18 Jan 2011 14:48:05 +0100
+Subject: [PATCH 2/3] ppc64 configure
---
src/native/unix/configure | 5 ++++-
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] Add support for 64bin PPC architectures to configure
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/native/unix/configure b/src/native/unix/configure
-index 8674972..a9284c0 100755
+index 3929ce8..62f35d9 100755
--- a/src/native/unix/configure
+++ b/src/native/unix/configure
-@@ -2979,7 +2979,10 @@ $as_echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;}
+@@ -2984,7 +2984,10 @@ $as_echo "failed" >&6; }
;;
esac
case $host_cpu in
@@ -64,5 +64,5 @@ index 93a3a14..449f3b1 100755
basic_machine=powerpcle-unknown
;;
--
-1.6.6.1
+1.7.3.4
diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch
new file mode 100644
index 0000000..f5806d1
--- /dev/null
+++ b/0003-s390x-configure.patch
@@ -0,0 +1,31 @@
+From 2c58c04e648f9c956c3c691ff456f9d1c7470ebe Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+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; }
+ 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\\\""
++ 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 97e0baf..34fe658 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,28 +3,20 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+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: %{name}-execve-path-warning.patch
-Patch1: %{name}-ppc64-configure.patch
-Patch2: %{name}-s390x-configure.patch
+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-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-resources-plugin
-BuildRequires: maven-surefire-plugin
+BuildRequires: maven
+BuildRequires: apache-commons-parent
BuildRequires: xmlto
Requires: java >= 1:1.6.0
@@ -32,7 +24,6 @@ Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This should go away with F-17
Provides: jakarta-%{short_name} = 1:%{version}-%{release}
@@ -72,9 +63,9 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p0 -b .execve
+%patch0 -p1 -b .execve
%patch1 -p1 -b .ppc
-%patch2 -p0 -b .s390
+%patch2 -p1 -b .s390
# remove java binaries from sources
rm -rf src/samples/build/
@@ -95,30 +86,20 @@ make %{?_smp_mflags}
popd
# build jars
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-local install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# install native jsvc
install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
# jars
-install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
@@ -129,13 +110,14 @@ install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -161,12 +143,17 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Tue Jan 18 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.5-1
+- Update to latest version
+- Use maven 3 to build
+- Versionless jars & javadocs
+- Use apache-commons-parent for BR
+
* Tue Oct 26 2010 Chris Spike <chris.spike at arcor.de> 1.0.4-2
- Added fix to remove java binaries from sources
diff --git a/sources b/sources
index d5c3120..42bdb26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7baae7f3dba28ac813f11846c4a74a2 commons-daemon-1.0.4-src.tar.gz
+2fe0a35d4a9c0338ecd45dad20f33662 commons-daemon-1.0.5-src.tar.gz
More information about the scm-commits
mailing list