This commit is contained in:
parent
34076916a7
commit
cf47a35fc0
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 16 05:52:07 UTC 2018 - fstrba@suse.com
|
||||
|
||||
- Build with source and target 8 to anticipate a possible removal
|
||||
of 1.6 compatibility in OpenJDK 11
|
||||
- Modified patch:
|
||||
* build.properties.patch
|
||||
+ specify source level 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 22 15:21:22 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
6
bsf.spec
6
bsf.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bsf
|
||||
#
|
||||
# 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
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -32,7 +32,7 @@ Patch1: build.properties.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: rhino
|
||||
@ -93,7 +93,7 @@ rm -fr bsf
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadocs
|
||||
%{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs
|
||||
|
||||
%install
|
||||
# jar
|
||||
|
@ -35,7 +35,7 @@ diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-proper
|
||||
+ <property name="site.dest" location="docs"/>
|
||||
+ <property name="site.projectFile" value="stylesheets/project.xml"/>
|
||||
+
|
||||
+ <property name="source.level" value="1.6" />
|
||||
+ <property name="source.level" value="8" />
|
||||
+
|
||||
+ <property name="src.dir" value="src"/>
|
||||
+
|
||||
|
Loading…
Reference in New Issue
Block a user