diff --git a/bsf.changes b/bsf.changes index fd9f9f7..b32233a 100644 --- a/bsf.changes +++ b/bsf.changes @@ -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 +- Modified patch: + * build.properties.patch + + specify source level 8 + ------------------------------------------------------------------- Fri Dec 22 15:21:22 UTC 2017 - fstrba@suse.com diff --git a/bsf.spec b/bsf.spec index 6910986..afc9820 100644 --- a/bsf.spec +++ b/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 diff --git a/build.properties.patch b/build.properties.patch index b410177..19bfafa 100644 --- a/build.properties.patch +++ b/build.properties.patch @@ -35,7 +35,7 @@ diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-proper + + + -+ ++ + + +