Hello community, here is the log from the commit of package bsh for openSUSE:Factory checked in at 2017-10-11 23:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh (Old) and /work/SRC/openSUSE:Factory/.bsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh" Wed Oct 11 23:01:54 2017 rev:21 rq:532989 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh/bsh.changes 2017-09-15 22:32:17.267212647 +0200 +++ /work/SRC/openSUSE:Factory/.bsh.new/bsh.changes 2017-10-11 23:01:54.947423791 +0200 @@ -1,0 +2,11 @@ +Wed Sep 20 08:28:50 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target level 1.6 +- Removed patch: + * bsh-java14compat.patch + + Don't hardcode source and target levels +- Added patch: + * bsh-getpeer.patch + + Access the inaccessible APIs by reflection + +------------------------------------------------------------------- Old: ---- bsh-java14compat.patch New: ---- bsh-getpeer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh.spec ++++++ --- /var/tmp/diff_new_pack.Ejjk6q/_old 2017-10-11 23:01:55.535398031 +0200 +++ /var/tmp/diff_new_pack.Ejjk6q/_new 2017-10-11 23:01:55.539397855 +0200 @@ -28,7 +28,7 @@ Source1: bsh-1.3.0.pom Source2: bsh-bsf-1.3.0.pom Patch0: %{name}-build.patch -Patch2: %{name}-java14compat.patch +Patch1: bsh-getpeer.patch BuildRequires: ant BuildRequires: bsf BuildRequires: fdupes @@ -42,7 +42,6 @@ Requires: bsf Requires: javapackages-tools BuildArch: noarch -BuildConflicts: java-devel >= 1.9 %description BeanShell is a small, free, embeddable Java source interpreter with @@ -98,7 +97,7 @@ %prep %setup -q -n %{Name} %patch0 -p1 -%patch2 +%patch1 -p1 find . -name "*.jar" -exec rm -f {} \; # remove all CVS files for dir in `find . -type d -name CVS`; do rm -rf $dir; done @@ -109,9 +108,9 @@ %build mkdir -p lib export CLASSPATH=$(build-classpath bsf servletapi5 xalan-j2) -ant dist -(cd docs/faq && ant) -(cd docs/manual && ant) +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist +(cd docs/faq && ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6) +(cd docs/manual && ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6) %install # jars ++++++ bsh-getpeer.patch ++++++ --- BeanShell/src/bsh/util/AWTConsole.java 2017-09-20 10:16:47.930104401 +0200 +++ BeanShell/src/bsh/util/AWTConsole.java 2017-09-20 10:23:56.354331886 +0200 @@ -220,8 +220,11 @@ Great. What a piece of crap. */ public void setCaretPosition( int pos ) { - ((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( + try { + ((java.awt.peer.TextComponentPeer)getClass().getMethod("getPeer").invoke(this, null)).setCaretPosition( pos + countNLs() ); + } catch (Exception e) { + } } /*
