Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2023-04-29 17:27:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Sat Apr 29 17:27:56 2023 rev:36 rq:1083524 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2019-04-17 11:22:05.946330196 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new.1533/bsh2.changes 2023-04-29 17:28:03.686522290 +0200 @@ -1,0 +2,24 @@ +Fri Apr 28 12:05:16 UTC 2023 - Fridrich Strba <[email protected]> + +- Update to version 2.1.1 + * Changes of 2.1.1 + + Fix src/bsh/util/AWTConsole.java breakage with newer Java + versions + * Changes of 2.1.0 + + This release formalizes the merge of 2.0b6 with suitable + backports from the development version of BeanShell. Also + included are are some ALv2 contributions to the BeanShell2 + fork that had not been folded into BeanShell but are still + applicable to this version. For backwards compatibility + purposes, the 2.x branch of BeanShell still supports a minimum + Java version of 1.6. +- Modified patch: + * beanshell-2.0b6-target.patch -> 0000-source-target-1.8.patch + + rediff to changed context and clean up +- Added patches: + * beanshell-2.0b6-getpeer.patch + + fixed in 2.1.1 + * bsh2-fix-tests.patch + + not needed any more + +------------------------------------------------------------------- Old: ---- 2.0b6.tar.gz beanshell-2.0b6-getpeer.patch beanshell-2.0b6-target.patch bsh2-fix-tests.patch New: ---- 0000-source-target-1.8.patch _service beanshell-2.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.wZdBsH/_old 2023-04-29 17:28:04.234524585 +0200 +++ /var/tmp/diff_new_pack.wZdBsH/_new 2023-04-29 17:28:04.242524618 +0200 @@ -1,7 +1,7 @@ # # spec file for package bsh2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,22 +18,18 @@ %define orig_name bsh -%define fversion 2.0b6 Name: bsh2 -Version: 2.0.0.b6 +Version: 2.1.1 Release: 0 Summary: Scripting for Java (BeanShell Version 2.x) -License: SPL-1.0 OR LGPL-2.0-or-later +License: LGPL-2.0-or-later OR SPL-1.0 Group: Development/Libraries/Java URL: http://www.beanshell.org/ -Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz +Source0: beanshell-%{version}.tar.xz #PATCH-FIX-OPENSUSE: use html output and JVM's built-in xmlns:redirect Patch3: bsh-2.0b5-docs.patch -#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 -Patch1003: beanshell-2.0b6-getpeer.patch +Patch1002: 0000-source-target-1.8.patch BuildRequires: ant BuildRequires: bsf BuildRequires: bsf-javadoc @@ -93,45 +89,25 @@ Scripting for Java (BeanShell Version 2.x) (demo and samples). %prep -%setup -q -n beanshell-%{fversion} +%setup -q -n beanshell-%{version} %patch3 -p1 -%patch1000 -p1 %patch1001 -p1 %patch1002 -p1 -%patch1003 -p1 -for j in $(find . -name "*.jar"); do - mv $j $j.no -done -# Remove bundled javax.script files under Sun's proprietary license -find engine/javax-src/javax/script/ -maxdepth 1 -type 'f' | xargs rm -mv tests/test-scripts/Data/addedCommand.jar.no tests/test-scripts/Data/addedCommand.jar -mv tests/test-scripts/Data/addclass.jar.no tests/test-scripts/Data/addclass.jar + +sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl %build build-jar-repository -s -p lib bsf javacc glassfish-servlet-api -pushd engine/javax-src/ -javac -cp $(build-classpath glassfish-servlet-api) -source 8 -target 8 $(find . -name "*.java") -jar cf ../../lib/javaxscript.jar $(find . -name "*.class" -o -name "*.html") -popd -# set VERSION -perl -p -i -e 's|VERSION =.*;|VERSION = "%{version}";|' src/bsh/Interpreter.java -ant \ - -Dbsf.javadoc=%{_javadocdir}/bsf \ - -Djava.javadoc=%{_javadocdir}/java \ - dist -(cd docs/faq && ant) -(cd docs/manual && ant) -%fdupes -s docs/ +ant dist %install # jars mkdir -p %{buildroot}%{_javadir}/%{name} -rm -f dist/%{orig_name}-%{fversion}-src.jar -rm -f dist/%{orig_name}-%{fversion}-sources.jar +rm -f dist/%{orig_name}-%{version}-src.jar +rm -f dist/%{orig_name}-%{version}-sources.jar for jar in dist/*.jar; do - install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{fversion}.jar`-%{version}.jar + install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{version}.jar`.jar done -(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done) # poms install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -163,7 +139,7 @@ # bshservlet mkdir -p %{buildroot}%{_datadir}/%{name}/bshservlet (cd %{buildroot}%{_datadir}/%{name}/bshservlet -jar xf $RPM_BUILD_DIR/beanshell-%{fversion}/dist/bshservlet.war +jar xf $RPM_BUILD_DIR/beanshell-%{version}/dist/bshservlet.war ) # scripts mkdir -p %{buildroot}%{_bindir} @@ -203,12 +179,7 @@ %fdupes -s %{buildroot} %fdupes docs/ -%files -%attr(0755,root,root) %{_bindir}/%{name} -%attr(0755,root,root) %{_bindir}/%{name}doc -%license LICENSE -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{orig_name}-%{version}.jar +%files -f .mfiles %{_javadir}/%{name}/%{orig_name}.jar %{_javadir}/%{name}/%{orig_name}-classpath*.jar %{_javadir}/%{name}/%{orig_name}-commands*.jar @@ -216,14 +187,11 @@ %{_javadir}/%{name}/%{orig_name}-engine*.jar %{_javadir}/%{name}/%{orig_name}-reflect*.jar %{_javadir}/%{name}/%{orig_name}-util*.jar +%attr(0755,root,root) %{_bindir}/%{name} +%attr(0755,root,root) %{_bindir}/%{name}doc +%license LICENSE %dir %{_datadir}/%{name} %{_datadir}/%{name}/bshservlet -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %files bsf %{_javadir}/%{name}/%{orig_name}-bsf*.jar ++++++ 0000-source-target-1.8.patch ++++++ diff --git a/build.xml b/build.xml index 8542245..6179cfa 100644 --- a/build.xml +++ b/build.xml @@ -16,8 +16,8 @@ <property name="file" value=""/> - <property name="ant.build.javac.target" value="1.6" /> - <property name="ant.build.javac.source" value="1.6" /> + <property name="ant.build.javac.target" value="1.8" /> + <property name="ant.build.javac.source" value="1.8" /> <property name="version" value="2.1.1"/> <property name="deprecation" value="on"/> <property name="Specification-Title" value="BeanShell" /> @@ -178,8 +178,8 @@ debug="on" includes="**/*.java" excludes="${excludes},**/bak/**" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <fileset refid="lib-fileset"/> @@ -213,8 +213,8 @@ debug="on" includes="**/*.java" excludes="${excludes},**/bak/**" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <fileset refid="lib-fileset"/> @@ -255,7 +255,7 @@ destdir="${javadoc-dir}" author="true" version="true" - source="1.6" + source="1.8" use="true" windowtitle="BeanShell ${version}" doctitle="<h1>BeanShell ${version}<h1>" @@ -680,8 +680,8 @@ destdir="${build-dir}" debug="on" debuglevel="lines,vars,source" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <path refid="test-classpath"/> ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/beanshell/beanshell.git</param> <param name="revision">2.1.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="exclude">**.jar</param> <param name="exclude">engine/javax-src/javax/script/*.java</param> <param name="exclude">engine/javax-src/javax/script/*.html</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
