From f827d5fba0e0fed5f79d45bac7f1722979c91afbba2b505bc3943c2739b2b46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 13 Jul 2018 17:57:10 +0000
Subject: [PATCH] Accepting request 622472 from openSUSE:Factory:RISCV

- apache-commons-daemon-riscv64.patch: add riscv64 to the list of
  supported cpus
- Use %license for LICENSE.txt

OBS-URL: https://build.opensuse.org/request/show/622472
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=24
---
 apache-commons-daemon-riscv64.patch | 30 +++++++++++++++++++++++++++++
 apache-commons-daemon.changes       | 11 +++++++++--
 apache-commons-daemon.spec          |  9 ++++++---
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 apache-commons-daemon-riscv64.patch

diff --git a/apache-commons-daemon-riscv64.patch b/apache-commons-daemon-riscv64.patch
new file mode 100644
index 0000000..17feb03
--- /dev/null
+++ b/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"]);;
diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes
index cab8292..1ac9422 100644
--- a/apache-commons-daemon.changes
+++ b/apache-commons-daemon.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 
@@ -24,8 +31,8 @@ Wed Mar 25 09:15:36 UTC 2015 - tchvatal@suse.com
 Tue Mar 24 13:54:27 UTC 2015 - tchvatal@suse.com
 
 - Drop unused patches:
-  * 0001-execve-path-warning.patch                                                                                                                                                           
-  * config-guess-sub-update.patch                                                                                                                                                            
+  * 0001-execve-path-warning.patch
+  * config-guess-sub-update.patch
   * jsvc-libcap-relative.patch
 
 -------------------------------------------------------------------
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 74457d5..4b9f0db 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -31,6 +31,7 @@ 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:  fdupes
@@ -78,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/
@@ -120,19 +122,20 @@ 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}