Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2018-11-06 14:26:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Tue Nov 6 14:26:28 2018 rev:33 rq:645923 version:2.0.0.b6 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2018-07-24 17:31:40.944008687 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2018-11-06 14:26:58.969650395 +0100 @@ -1,0 +2,18 @@ +Thu Nov 1 12:44:36 UTC 2018 - Fridrich Strba <[email protected]> + +- Do not build against an old system asm, but use the few shaded + files source files distributed in the tarball. +- Removed patches: + * bsh2-ClassGeneratorUtil.patch + * bsh2-asm.patch + - not needed after the above change +- Modified patch: + * beanshell-2.0b6-target.patch + - fix source level to correspond to the target + +------------------------------------------------------------------- +Thu Oct 18 03:03:38 UTC 2018 - Fridrich Strba <[email protected]> + +- Use the pom.xml file from the sources to generate maven provides + +------------------------------------------------------------------- Old: ---- beanshell-2.0b5.pom bsh-bsf-2.0b5.pom bsh-classgen-2.0b5.pom bsh-classpath-2.0b5.pom bsh-commands-2.0b5.pom bsh-core-2.0b5.pom bsh-engine-2.0b5.pom bsh-reflect-2.0b5.pom bsh-util-2.0b5.pom bsh2-ClassGeneratorUtil.patch bsh2-asm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.dAwfNd/_old 2018-11-06 14:27:00.485648346 +0100 +++ /var/tmp/diff_new_pack.dAwfNd/_new 2018-11-06 14:27:00.489648341 +0100 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,19 +25,8 @@ Summary: Lightweight Scripting for Java (BeanShell Version 2.x) License: SPL-1.0 OR LGPL-2.0-or-later Group: Development/Libraries/Java -Url: http://www.beanshell.org/ +URL: http://www.beanshell.org/ Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz -Source1: beanshell-2.0b5.pom -Source2: bsh-classpath-2.0b5.pom -Source3: bsh-commands-2.0b5.pom -Source4: bsh-core-2.0b5.pom -Source5: bsh-reflect-2.0b5.pom -Source6: bsh-util-2.0b5.pom -Source7: bsh-bsf-2.0b5.pom -Source8: bsh-classgen-2.0b5.pom -Source9: bsh-engine-2.0b5.pom -Patch1: %{name}-asm.patch -Patch2: %{name}-ClassGeneratorUtil.patch #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 @@ -46,21 +35,16 @@ Patch1002: beanshell-2.0b6-target.patch Patch1003: beanshell-2.0b6-getpeer.patch BuildRequires: ant -BuildRequires: asm >= 1.5.3 -BuildRequires: asm-javadoc BuildRequires: bsf BuildRequires: bsf-javadoc BuildRequires: fdupes -# Disable this one whenever the javadoc build is fixed for jdk9 BuildRequires: java-devel >= 1.8 BuildRequires: javacc3 # Needed for maven conversions BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: servletapi4 Requires: bsf Requires: javapackages-tools -Requires: objectweb-asm BuildArch: noarch %description @@ -103,7 +87,6 @@ %package classgen Summary: ASM support for bsh2 Group: Development/Libraries/Java -Requires: asm %description classgen Lightweight Scripting for Java (BeanShell Version 2.x) (ASM support). @@ -132,8 +115,6 @@ %prep %setup -q -n beanshell-%{fversion} -%patch1 -p1 -%patch2 %patch3 -p1 %patch1000 -p1 %patch1001 -p1 @@ -148,18 +129,14 @@ mv tests/test-scripts/Data/addclass.jar.no tests/test-scripts/Data/addclass.jar %build -build-jar-repository -s -p lib asm/asm bsf javacc3 servlet +build-jar-repository -s -p lib bsf javacc3 servlet pushd engine/javax-src/ javac -cp $(build-classpath servlet) -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 -# remove internal asm code, use JPackage external jar instead -rm -rf src/bsh/org -perl -p -i -e 's|bsh.org.objectweb.asm|org.objectweb.asm|' src/bsh/ClassGeneratorUtil.java ant \ - -Dasm.javadoc=%{_javadocdir}/asm \ -Dbsf.javadoc=%{_javadocdir}/bsf \ -Djava.javadoc=%{_javadocdir}/java \ dist @@ -179,34 +156,9 @@ # poms install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 %{SOURCE1} \ +install -m 644 pom.xml \ %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh.pom -install -m 644 %{SOURCE2} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classpath.pom -install -m 644 %{SOURCE3} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-commands.pom -install -m 644 %{SOURCE4} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-core.pom -install -m 644 %{SOURCE5} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-reflect.pom -install -m 644 %{SOURCE6} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-util.pom -install -m 644 %{SOURCE7} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-bsf.pom -install -m 644 %{SOURCE8} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classgen.pom -install -m 644 %{SOURCE9} \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-engine.pom - -%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name} -%add_maven_depmap JPP.%{name}-bsh-classpath.pom %{name}/bsh-classpath.jar -%add_maven_depmap JPP.%{name}-bsh-commands.pom %{name}/bsh-commands.jar -%add_maven_depmap JPP.%{name}-bsh-core.pom %{name}/bsh-core.jar -%add_maven_depmap JPP.%{name}-bsh-reflect.pom %{name}/bsh-reflect.jar -%add_maven_depmap JPP.%{name}-bsh-util.pom %{name}/bsh-util.jar -%add_maven_depmap JPP.%{name}-bsh-bsf.pom %{name}/bsh-bsf.jar -%add_maven_depmap JPP.%{name}-bsh-classgen.pom %{name}/bsh-classgen.jar -%add_maven_depmap JPP.%{name}-bsh-engine.pom %{name}/bsh-engine.jar +%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name},bsh:bsh,bsh:bsh-bsf,org.beanshell:bsh # manual find docs -name ".cvswrappers" -exec rm -f {} \; @@ -280,7 +232,7 @@ %files %attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/%{name}doc -%doc LICENSE +%license LICENSE %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{orig_name}-%{version}.jar %{_javadir}/%{name}/%{orig_name}.jar @@ -293,7 +245,11 @@ %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 ++++++ beanshell-2.0b6-target.patch ++++++ --- /var/tmp/diff_new_pack.dAwfNd/_old 2018-11-06 14:27:00.533648281 +0100 +++ /var/tmp/diff_new_pack.dAwfNd/_new 2018-11-06 14:27:00.533648281 +0100 @@ -5,7 +5,7 @@ optimize="on" debug="on" - target="1.5" -+ source="1.6" ++ source="8" + target="8" includes="**/*.java" excludes="${excludes},**/bak/**"
