Accepting request 1148447 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148447
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsh2?expand=0&rev=37

0000-source-target-1.8.patch

@@ -0,0 +1,57 @@
+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="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
+@@ -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"/>

2.0b6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbcd8296a0aa81b5edc80a5421841b968d031332ffcebf3b2c877969669f5cad
-size 1720334

_service

@@ -0,0 +1,16 @@
+<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>

beanshell-2.0b6-getpeer.patch

@@ -1,15 +0,0 @@
---- 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

@@ -1,31 +0,0 @@
---- 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"
-+			source="8"
-+			target="8"
- 			includes="**/*.java"
- 			excludes="${excludes},**/bak/**"
- 		>
-@@ -213,12 +214,16 @@
- 			 destdir="${javadoc-dir}"
- 			 author="true"
- 			 version="true"
--       source="1.5"
-+			 source="8"
- 			 use="true"
- 			 windowtitle="BeanShell ${version}"
- 			 doctitle="<h1>BeanShell ${version}<h1>"
- 			 bottom="<em>© 2000-2005 pat@pat.net :-)</em>"
--		/>
-+		>
-+			<classpath>
-+				<fileset refid="lib-fileset"/>
-+			</classpath>
-+		</javadoc>
- 	</target>
- 
- 	<!-- Jar target setup -->

bsh2-fix-tests.patch

@@ -1,20 +0,0 @@
-Index: beanshell-2.0b6/engine/src/TestBshScriptEngine.java
-===================================================================
---- beanshell-2.0b6.orig/engine/src/TestBshScriptEngine.java
-+++ beanshell-2.0b6/engine/src/TestBshScriptEngine.java
-@@ -54,6 +54,7 @@ public class TestBshScriptEngine
- 		runnable.run();
- 		assertTrue( (Boolean)engine.get("flag") == true );
- 
-+                /* FIXME
- 		// get interface from scripted object
- 		engine.eval(
- 			"flag2=false; myObj() { run() { flag2=true; } return this; }");
-@@ -64,6 +65,7 @@ public class TestBshScriptEngine
- 			(Runnable)invocable.getInterface( scriptedObject, Runnable.class );
- 		runnable.run();
- 		assertTrue( (Boolean)engine.get("flag2") == true );
-+                */
- 
- 		// Run with alternate bindings
- 		assertTrue( (Boolean)engine.get("flag") == true );

bsh2.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Wed Feb 21 08:31:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Fri Apr 28 12:05:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
+Mon Apr 15 08:26:46 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Replace find -exec rm by just -delete.
+- Trim BSH 2.x changelog from description, and trim "In other
+  words" description repetition. Trim leftover filler wording
+  from description.
+
 -------------------------------------------------------------------
 Thu Feb  7 07:17:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

bsh2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bsh2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 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:        Lightweight Scripting for Java (BeanShell Version 2.x)
-License:        SPL-1.0 OR LGPL-2.0-or-later
+Summary:        Scripting for Java (BeanShell Version 2.x)
+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
@@ -41,39 +37,19 @@ BuildRequires:  fdupes
 BuildRequires:  glassfish-servlet-api
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 Requires:       bsf
 Requires:       javapackages-tools
 BuildArch:      noarch
 
 %description
-BeanShell is a small, free, embeddable, Java source interpreter with
-object scripting language features, written in Java. BeanShell executes
+BeanShell is an embeddable Java source interpreter with object
+scripting language features, written in Java. BeanShell executes
 standard Java statements and expressions, in addition to obvious
 scripting commands and syntax. BeanShell supports scripted objects as
-simple method closures like those in Perl and JavaScript(tm). You can
-use BeanShell interactively for Java experimentation and debugging or
-as a simple scripting engine for your applications. In short: BeanShell
-is a dynamically interpreted Java, plus some useful stuff. Another way
-to describe it is to say that in many ways BeanShell is to Java as
-Tcl/Tk is to C: BeanShell is embeddable - You can call BeanShell from
-your Java applications to execute Java code dynamically at run-time or
-to provide scripting extensibility for your applications.
-Alternatively, you can call your Java applications and objects from
-BeanShell; working with Java objects and APIs dynamically. Since
-BeanShell is written in Java and runs in the same space as your
-application, you can freely pass references to "real live" objects into
-scripts and return them as results.
-
-With version 2.0 BeanShell becomes a fully Java compatible scripting
-language. BeanShell is now capable of interpreting ordinary Java source
-and loading .java source files from the class path. BeanShell scripted
-classes are fully typed and appear to outside Java code and via
-reflective inspection as ordinary classes. However their implementation
-is fully dynamic and they may include arbitrary BeanShell scripts in
-their bodies, methods, and constructors. Users may now freely mix
-loose, unstructured BeanShell scripts, method closures, and full
-scripted classes.
+simple method closures like those in Perl and JavaScript. BeanShell
+can be used interactively for Java experimentation and debugging or
+as a scripting engine for applications.
 
 %package bsf
 Summary:        BSF support for bsh2
@@ -81,28 +57,28 @@ Group:          Development/Libraries/Java
 Requires:       bsf
 
 %description bsf
-Lightweight Scripting for Java (BeanShell Version 2.x) (BSF support).
+Scripting for Java (BeanShell Version 2.x) (BSF support).
 
 %package classgen
 Summary:        ASM support for bsh2
 Group:          Development/Libraries/Java
 
 %description classgen
-Lightweight Scripting for Java (BeanShell Version 2.x) (ASM support).
+Scripting for Java (BeanShell Version 2.x) (ASM support).
 
 %package manual
 Summary:        Documentation for bsh2
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description manual
-Lightweight Scripting for Java (BeanShell Version 2.x) (Manual).
+Scripting for Java (BeanShell Version 2.x) (Manual).
 
 %package javadoc
 Summary:        Javadoc for bsh2
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description javadoc
-Lightweight Scripting for Java (BeanShell Version 2.x) (Java Documentation).
+Scripting for Java (BeanShell Version 2.x) (Java Documentation).
 
 %package demo
 Summary:        Demonstrations and samples for bsh2
@@ -110,63 +86,38 @@ Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}-%{release}
 
 %description demo
-Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples).
+Scripting for Java (BeanShell Version 2.x) (demo and samples).
 
 %prep
-%setup -q -n beanshell-%{fversion}
-%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
+%setup -q -n beanshell-%{version}
+%patch -P 3 -p1
+%patch -P 1001 -p1
+%patch -P 1002 -p1
+
+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}
-install -m 644 pom.xml \
+%{mvn_install_pom} pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh.pom
 %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 {} \;
-find docs -name "*.xml" -exec rm -f {} \;
-find docs -name "*.xsl" -exec rm -f {} \;
-find docs -name "*.log" -exec rm -f {} \;
-(cd docs/manual && mv -f html/* .)
-(cd docs/manual && rm -rf html)
-(cd docs/manual && rm -rf xsl)
+find docs "(" -name ".cvswrappers" -o -name "*.xml" -o -name "*.xsl" -o -name "*.log" ")" -delete
+(cd docs/manual && mv -f html/* . && rm -Rf html xsl)
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -188,7 +139,7 @@ find %{buildroot}%{_datadir}/%{name} -type f ! -name "*.bsh" \
 # 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}
@@ -228,12 +179,7 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc
 %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
@@ -241,14 +187,11 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc
 %{_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