rpm/apache-commons-daemon
SHA256
1
0
Fork 0
forked from pool/apache-commons-daemon
Code Pull Requests Activity

Fix build with java9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=20
This commit is contained in:
Fridrich Strba 2017-09-14 11:23:32 +00:00 committed by Git OBS Bridge
parent 2ae8318fd9
commit 62fe60b332
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-daemon.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 14 11:22:56 UTC 2017 - fstrba@suse.com
- Fix jdk9 build by specifying java source and target 1.6
-------------------------------------------------------------------
Fri May 19 09:18:53 UTC 2017 - pcervinka@suse.com

10
apache-commons-daemon.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-daemon
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -42,7 +42,6 @@ Provides: jakarta-%{short_name} = %{version}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: jakarta-%{short_name}-java = %{version}
Obsoletes: jakarta-%{short_name}-java < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The Daemon Component contains a set of Java and native code, including
@ -97,7 +96,9 @@ xmlto man man/jsvc.1.xml
make %{?_smp_mflags} clean
make %{?_smp_mflags}
popd
ant jar test javadoc
ant \
-Dcompile.source=1.6 -Dcompile.target=1.6 \
jar test javadoc
%install
# install native jsvc
@ -117,7 +118,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root)
%doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
@ -125,13 +125,11 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%{_datadir}/maven-metadata/%{name}.xml
%files jsvc
%defattr(-,root,root)
%doc LICENSE.txt
%{_bindir}/jsvc
%{_mandir}/man1/jsvc.1*
%files javadoc
%defattr(-,root,root)
%doc LICENSE.txt
%doc src/docs/*
%doc %{_javadocdir}/%{name}