pool/apache-commons-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 622472 from openSUSE:Factory:RISCV

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2018-07-13 17:57:10 +00:00 committed by Git OBS Bridge
parent 9a24960f3c
commit f827d5fba0
3 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apache-commons-daemon-riscv64.patch Normal file
View File

@ -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"]);;

11
apache-commons-daemon.changes
View File

@ -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
-------------------------------------------------------------------

9
apache-commons-daemon.spec
View File

@ -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}