Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2017-09-27 16:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Wed Sep 27 16:49:10 2017 rev:31 rq:527488 version:2.0.0.b6 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2017-09-13 22:19:27.535478026 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2017-09-27 16:49:13.234838589 +0200 @@ -1,0 +2,13 @@ +Wed Sep 20 09:11:09 UTC 2017 - [email protected] + +- Build with whatever is the default java-devel provider +- Modified patch: + * beanshell-2.0b6-target.patch + + specify target and source consistently + + fix classpath issue with javadoc generation +- Added patch: + * beanshell-2.0b6-getpeer.patch + + fix build with jdk9 + + access the inacessible APIs by reflection + +------------------------------------------------------------------- New: ---- beanshell-2.0b6-getpeer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.Xw4LfE/_old 2017-09-27 16:49:14.046724338 +0200 +++ /var/tmp/diff_new_pack.Xw4LfE/_new 2017-09-27 16:49:14.046724338 +0200 @@ -23,7 +23,7 @@ Version: 2.0.0.b6 Release: 0 Summary: Lightweight Scripting for Java (BeanShell Version 2.x) -License: SPL-1.0 or LGPL-2.0+ +License: SPL-1.0 OR LGPL-2.0+ Group: Development/Libraries/Java Url: http://www.beanshell.org/ Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz @@ -44,6 +44,7 @@ Patch1000: bsh2-fix-tests.patch Patch1001: reproducible.patch Patch1002: beanshell-2.0b6-target.patch +Patch1003: beanshell-2.0b6-getpeer.patch BuildRequires: ant BuildRequires: asm >= 1.5.3 BuildRequires: asm-javadoc @@ -51,16 +52,15 @@ BuildRequires: bsf-javadoc BuildRequires: fdupes # Disable this one whenever the javadoc build is fixed for jdk9 -BuildRequires: java-1_8_0-openjdk-devel +BuildRequires: java-devel BuildRequires: javacc3 -BuildRequires: javapackages-tools # Needed for maven conversions BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: servletapi4 Requires: bsf Requires: javapackages-tools Requires: objectweb-asm -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -123,7 +123,6 @@ Lightweight Scripting for Java (BeanShell Version 2.x) (Java Documentation). %package demo -AutoReqProv: no Summary: Demonstrations and samples for bsh2 Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} @@ -139,6 +138,7 @@ %patch1000 -p1 %patch1001 -p1 %patch1002 -p1 +%patch1003 -p1 for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -148,16 +148,9 @@ mv tests/test-scripts/Data/addclass.jar.no tests/test-scripts/Data/addclass.jar %build -pushd lib -ln -sf $(build-classpath asm/asm) -ln -sf $(build-classpath bsf) -ln -sf $(build-classpath javacc3) javacc.jar -ln -sf $(build-classpath servlet) -#mv javaxscript.jar.no javaxscript.jar -popd +build-jar-repository -s -p lib asm/asm bsf javacc3 servlet pushd engine/javax-src/ -export CLASSPATH=$(build-classpath servlet) -javac $(find . -name "*.java") +javac -cp $(build-classpath servlet) -source 1.6 -target 1.6 $(find . -name "*.java") jar cf ../../lib/javaxscript.jar $(find . -name "*.class" -o -name "*.html") popd # set VERSION @@ -166,7 +159,6 @@ 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.6 -Dant.build.javac.target=1.6 \ -Dasm.javadoc=%{_javadocdir}/asm \ -Dbsf.javadoc=%{_javadocdir}/bsf \ -Djava.javadoc=%{_javadocdir}/java \ @@ -286,7 +278,6 @@ %fdupes docs/ %files -%defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/%{name}doc %doc LICENSE @@ -305,23 +296,18 @@ %{_datadir}/maven-metadata/%{name}.xml* %files bsf -%defattr(0644,root,root,0755) %{_javadir}/%{name}/%{orig_name}-bsf*.jar %files classgen -%defattr(0644,root,root,0755) %{_javadir}/%{name}/%{orig_name}-classgen*.jar %files manual -%defattr(0644,root,root,0755) %doc docs/* %files javadoc -%defattr(0644,root,root,0755) %dir %{_javadocdir}/%{name} %{_javadocdir}/%{name} %files demo -f %{name}-demo-%{version}.files -%defattr(0644,root,root,0755) %changelog ++++++ beanshell-2.0b6-getpeer.patch ++++++ --- beanshell-2.0b6/src/bsh/util/AWTConsole.java 2017-09-20 10:34:59.026403121 +0200 +++ beanshell-2.0b6/src/bsh/util/AWTConsole.java 2017-09-20 10:36:05.353110242 +0200 @@ -214,8 +214,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) { + } } /* ++++++ beanshell-2.0b6-target.patch ++++++ --- /var/tmp/diff_new_pack.Xw4LfE/_old 2017-09-27 16:49:14.086718710 +0200 +++ /var/tmp/diff_new_pack.Xw4LfE/_new 2017-09-27 16:49:14.086718710 +0200 @@ -1,11 +1,31 @@ ---- 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 @@ +--- beanshell-2.0b6/build.xml 2017-09-20 10:43:43.236033837 +0200 ++++ beanshell-2.0b6/build.xml 2017-09-20 11:03:53.758564875 +0200 +@@ -170,7 +170,8 @@ deprecation="${deprecation}" optimize="on" debug="on" - target="1.5" -+ target="1.6" ++ source="1.6" ++ target="1.6" includes="**/*.java" excludes="${excludes},**/bak/**" > +@@ -213,12 +214,16 @@ + destdir="${javadoc-dir}" + author="true" + version="true" +- source="1.5" ++ source="1.6" + use="true" + windowtitle="BeanShell ${version}" + doctitle="<h1>BeanShell ${version}<h1>" + bottom="<em>© 2000-2005 [email protected] :-)</em>" +- /> ++ > ++ <classpath> ++ <fileset refid="lib-fileset"/> ++ </classpath> ++ </javadoc> + </target> + + <!-- Jar target setup -->
