Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2017-09-13 22:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Wed Sep 13 22:19:26 2017 rev:30 rq:522105 version:2.0.0.b6 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2017-05-31 13:28:15.652888324 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2017-09-13 22:19:27.535478026 +0200 @@ -1,0 +2,11 @@ +Thu Sep 7 17:25:40 UTC 2017 - [email protected] + +- Added patch: + * beanshell-2.0b6-target.patch + - Force java target level to 1.6 +- Force java source and target levels to 1.6 in order to allow + building with jdk9 +- Force building with java-1_8_0-openjdk-devel since javadoc errors + are fatal in jdk9 + +------------------------------------------------------------------- New: ---- beanshell-2.0b6-target.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.GbiufK/_old 2017-09-13 22:19:28.495342894 +0200 +++ /var/tmp/diff_new_pack.GbiufK/_new 2017-09-13 22:19:28.511340642 +0200 @@ -43,13 +43,15 @@ #PATCH-FIX-OPENSUSE: those two patches fixes a compatibility with a standard javax.script API Patch1000: bsh2-fix-tests.patch Patch1001: reproducible.patch +Patch1002: beanshell-2.0b6-target.patch BuildRequires: ant BuildRequires: asm >= 1.5.3 BuildRequires: asm-javadoc BuildRequires: bsf BuildRequires: bsf-javadoc BuildRequires: fdupes -BuildRequires: java-devel >= 1.6.0 +# Disable this one whenever the javadoc build is fixed for jdk9 +BuildRequires: java-1_8_0-openjdk-devel BuildRequires: javacc3 BuildRequires: javapackages-tools # Needed for maven conversions @@ -136,6 +138,7 @@ %patch3 -p1 %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -163,7 +166,7 @@ rm -rf src/bsh/org perl -p -i -e 's|bsh.org.objectweb.asm|org.objectweb.asm|' src/bsh/ClassGeneratorUtil.java ant \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dasm.javadoc=%{_javadocdir}/asm \ -Dbsf.javadoc=%{_javadocdir}/bsf \ -Djava.javadoc=%{_javadocdir}/java \ ++++++ beanshell-2.0b6-target.patch ++++++ --- beanshell-2.0b6/build.xml 2016-02-05 18:16:07.000000000 +0100 +++ beanshell-2.0b6/build.xml 2017-09-07 15:15:01.488260005 +0200 @@ -170,7 +170,7 @@ deprecation="${deprecation}" optimize="on" debug="on" - target="1.5" + target="1.6" includes="**/*.java" excludes="${excludes},**/bak/**" >
