diff --git a/apache-commons-daemon-1.2.0-JAVA_OS.patch b/apache-commons-daemon-1.2.0-JAVA_OS.patch deleted file mode 100644 index fce280b..0000000 --- a/apache-commons-daemon-1.2.0-JAVA_OS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- commons-daemon-1.2.0-src/src/native/unix/configure.in-orig 2019-06-28 10:21:30.000000000 -0300 -+++ commons-daemon-1.2.0-src/src/native/unix/configure.in 2019-07-10 03:53:58.900381022 -0300 -@@ -98,7 +98,7 @@ - AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC]) - INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" - else -- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os" -+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS" - fi - - dnl ------------------------------------------------------------------------- diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index b608e6d..1b69076 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,13 +3,18 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.0.15 +Release: 19%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -Patch1: apache-commons-daemon-1.2.0-JAVA_OS.patch +Patch1: apache-commons-daemon-JAVA_OS.patch +# backport from https://fisheye6.atlassian.com/changelog/commons?cs=1458896 +Patch2: apache-commons-daemon-secondary.patch +# backport from http://svn.apache.org/viewvc?view=revision&revision=1533345 +# https://issues.apache.org/jira/browse/DAEMON-308 +Patch3: apache-commons-daemon-aarch64.patch BuildRequires: maven-local BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils @@ -18,7 +23,6 @@ BuildRequires: maven-surefire-provider-junit BuildRequires: xmlto BuildRequires: gcc BuildRequires: make -BuildRequires: autoconf %description @@ -48,6 +52,8 @@ BuildArch: noarch %prep %setup -q -n %{short_name}-%{version}-src %patch1 -p1 -b .java_os +%patch2 -p1 -b .secondary +%patch3 -p1 -b .aarch64 # remove java binaries from sources rm -rf src/samples/build/ @@ -61,7 +67,6 @@ xmlto man man/jsvc.1.xml # build native jsvc pushd src/native/unix -sh support/buildconf.sh %configure --with-java=%{java_home} # this is here because 1.0.2 archive contains old *.o make clean @@ -98,9 +103,6 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 %changelog -* Wed Jul 10 2019 Filipe Rosset - 1.2.0-1 -- Update to 1.2.0 - * Thu Jan 31 2019 Fedora Release Engineering - 1.0.15-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild