Fridrich Strba 2018-05-15 13:01:24 +00:00 committed by Git OBS Bridge
parent 398bd1a2f3
commit f0278fc4f9
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 15 12:56:51 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 13:31:34 UTC 2017 - fstrba@suse.com Thu Sep 14 13:31:34 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-math # spec file for package apache-commons-math
# #
# 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,10 +29,11 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
Patch0: commons-math3-3.6.1-notests.patch Patch0: commons-math3-3.6.1-notests.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
Requires: java >= 1.6.0 Requires: java >= 1.8
Provides: java(commons-math3:commons-math3) = %{version} Provides: java(commons-math3:commons-math3) = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -55,8 +56,8 @@ This package contains the API documentation for %{name}.
%build %build
export CLASSPATH=$(build-classpath ant-junit junit) export CLASSPATH=$(build-classpath ant-junit junit)
ant -Dant.build.javac.source=1.6 -Dcompile.source=1.6 \ ant -Dant.build.javac.source=8 -Dcompile.source=8 \
-Dant.build.javac.target=1.6 -Dcompile.target=1.6 \ -Dant.build.javac.target=8 -Dcompile.target=8 \
-Dmaven.mode.offline=true -Dmaven.test.skip=true \ -Dmaven.mode.offline=true -Dmaven.test.skip=true \
-lib %{_datadir}/java -Dbuild.sysclasspath=first \ -lib %{_datadir}/java -Dbuild.sysclasspath=first \
jar javadoc jar javadoc