Accepting request 622501 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/622501
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-daemon?expand=0&rev=14

apache-commons-daemon-riscv64.patch

@@ -0,0 +1,30 @@
+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"]);;

apache-commons-daemon.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jul 12 15:01:55 UTC 2018 - schwab@suse.de
+
+- 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 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility
+- Run fdupes on documentation
+
 -------------------------------------------------------------------
 Thu Sep 14 11:22:56 UTC 2017 - fstrba@suse.com
 

apache-commons-daemon.spec

@@ -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 @@ Patch0:         apache-commons-daemon-JAVA_OS.patch
 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 @@ The Javadoc Documentation for Commons Daemon.
 %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} clean
 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 @@ install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 # 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}