Hello community,
here is the log from the commit of package apache-commons-daemon for
openSUSE:Factory checked in at 2018-07-24 17:32:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-daemon (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-daemon"
Tue Jul 24 17:32:53 2018 rev:14 rq:622501 version:1.0.15
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-daemon/apache-commons-daemon.changes
2017-09-14 21:18:58.974761211 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-daemon.new/apache-commons-daemon.changes
2018-07-24 17:32:55.228102358 +0200
@@ -1,0 +2,14 @@
+Thu Jul 12 15:01:55 UTC 2018 - [email protected]
+
+- apache-commons-daemon-riscv64.patch: add riscv64 to the list of
+ supported cpus
+- Use %license for LICENSE.txt
+
+-------------------------------------------------------------------
+Tue May 15 08:29:55 UTC 2018 - [email protected]
+
+- Build with source and target 8 to prepare for a possible removal
+ of 1.6 compatibility
+- Run fdupes on documentation
+
+-------------------------------------------------------------------
New:
----
apache-commons-daemon-riscv64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-daemon.spec ++++++
--- /var/tmp/diff_new_pack.w2rDu7/_old 2018-07-24 17:32:55.976103301 +0200
+++ /var/tmp/diff_new_pack.w2rDu7/_new 2018-07-24 17:32:55.976103301 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-daemon
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,9 +31,11 @@
Patch1: apache-commons-daemon-s390x.patch
Patch2: apache-commons-daemon-ppc64.patch
Patch3: apache-commons-daemon-aarch64.patch
+Patch4: apache-commons-daemon-riscv64.patch
BuildRequires: ant
BuildRequires: apache-commons-parent
-BuildRequires: java-devel
+BuildRequires: fdupes
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: libcap-devel
@@ -77,6 +79,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# remove java binaries from sources
rm -rf src/samples/build/
@@ -97,7 +100,7 @@
make %{?_smp_mflags}
popd
ant \
- -Dcompile.source=1.6 -Dcompile.target=1.6 \
+ -Dcompile.source=8 -Dcompile.target=8 \
jar test javadoc
%install
@@ -116,21 +119,23 @@
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
-%doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
+%license LICENSE.txt
+%doc PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/maven-metadata/%{name}.xml
%files jsvc
-%doc LICENSE.txt
+%license LICENSE.txt
%{_bindir}/jsvc
%{_mandir}/man1/jsvc.1*
%files javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%doc src/docs/*
%doc %{_javadocdir}/%{name}
++++++ apache-commons-daemon-riscv64.patch ++++++
Index: commons-daemon-1.0.15-src/src/native/unix/configure
===================================================================
--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
+++ commons-daemon-1.0.15-src/src/native/unix/configure
@@ -2709,6 +2709,10 @@ echo "$as_me: error: Unsupported operati
CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
HOST_CPU=$host_cpu
;;
+ riscv64)
+ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
+ HOST_CPU=$host_cpu
+ ;;
*)
echo "$as_me:$LINENO: result: failed" >&5
echo "${ECHO_T}failed" >&6
Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
===================================================================
--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
@@ -175,6 +175,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
HOST_CPU=$host_cpu
;;
+ riscv64)
+ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
+ HOST_CPU=$host_cpu
+ ;;
*)
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;