Fridrich Strba 2018-05-15 13:20:26 +00:00 committed by Git OBS Bridge
parent 9f425edf13
commit f494c7d6d8
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 15 13:19:59 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
- Run fdupes on documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 14:55:25 UTC 2017 - fstrba@suse.com Thu Sep 14 14:55:25 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool2 # spec file for package apache-commons-pool2
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,8 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
Patch0: jakarta-commons-pool-build.patch Patch0: jakarta-commons-pool-build.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: cglib BuildRequires: cglib
BuildRequires: java-devel BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
Requires: cglib Requires: cglib
@ -65,7 +66,9 @@ find . -name "*.jar" -exec rm -f {} \;
%build %build
echo "cglib.jar=$(build-classpath cglib)" >> build.properties echo "cglib.jar=$(build-classpath cglib)" >> build.properties
ant -Djava.io.tmpdir=. clean dist ant \
-Djavac.target.version=8 -Djavac.src.version=8 \
-Djava.io.tmpdir=. clean dist
%install %install
# jars # jars
@ -76,6 +79,7 @@ install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
# javadoc # javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%doc README.txt LICENSE.txt %doc README.txt LICENSE.txt