PR#1: Update to 1.2.0 - rpms/apache-commons-daemon

rpms / apache-commons-daemon

#1 Update to 1.2.0

Closed 4 years ago by decathorpe. Opened 4 years ago by filiperosset.

rpms/ filiperosset/apache-commons-daemon master into master

Update to 1.2.0

Filipe Rosset • 4 years ago

9d0a87c

apache-commons-daemon-1.2.0-JAVA_OS.patch

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ --- 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 -------------------------------------------------------------------------`

apache-commons-daemon.spec

file modified

+8 -10

		`@@ -3,18 +3,13 @@`
		`%global short_name commons-%{base_name}`

		`Name: apache-%{short_name}`
		`- Version: 1.0.15`
		`- Release: 19%{?dist}`
		`+ Version: 1.2.0`
		`+ Release: 1%{?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-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`
		`+ Patch1: apache-commons-daemon-1.2.0-JAVA_OS.patch`
		`BuildRequires: maven-local`
		`BuildRequires: java-devel >= 1:1.6.0`
		`BuildRequires: jpackage-utils`
		`@@ -23,6 +18,7 @@`
		`BuildRequires: xmlto`
		`BuildRequires: gcc`
		`BuildRequires: make`
		`+ BuildRequires: autoconf`


		`%description`
		`@@ -52,8 +48,6 @@`
		`%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/`
		`@@ -67,6 +61,7 @@`

		`# 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`
		`@@ -103,6 +98,9 @@`


		`%changelog`
		`+ * Wed Jul 10 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.2.0-1`
		`+ - Update to 1.2.0`
		`+`
		`* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-19`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`

filiperosset commented 4 years ago

Update to 1.2.0
Scratch build https://koji.fedoraproject.org/koji/taskinfo?taskID=36162579
patch JAVA_OS fixed for 1.2.0
Upstremaed Patches:
- apache-commons-daemon-aarch64.patch
- apache-commons-daemon-secondary.patch

decathorpe commented 4 years ago

please rebase your fork against master (the accidental commits you introduced in the main repo prevent a clean merge)
you forgot to upload the new sources with fedpkg new-sources in your fork

churchyard commented 4 years ago

I've clicked the rebase button and suddenly there are no commits. Sorry about that.

decathorpe commented 4 years ago

@filiperosset @churchyard if you don't have objections, I can take your changes and submit a new / fixed pull request. I think that's easier than doing git repo surgery now

churchyard commented 4 years ago

Please do, no surgery happens, the revert commit made it quite hard.

decathorpe commented 4 years ago

Superseded by https://src.fedoraproject.org/rpms/apache-commons-daemon/pull-request/2

Thanks!