OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsh2?expand=0&rev=54

0000-source-target-1.8.patch

@@ -10,7 +10,7 @@ index 8542245..6179cfa 100644
 -	<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.0"/>
+ 	<property name="version" value="2.1.1"/>
  	<property name="deprecation" value="on"/>
  	<property name="Specification-Title" value="BeanShell" />
 @@ -178,8 +178,8 @@

2.0b6.tar.gz

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

2.1.0.tar.gz

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

_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) {
-+		}
- 	}
- 
- 	/*

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.spec

@@ -19,18 +19,17 @@
 
 %define orig_name bsh
 Name:           bsh2
-Version:        2.1.0
+Version:        2.1.1
 Release:        0
 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/%{version}.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
 Patch1001:      reproducible.patch
 Patch1002:      0000-source-target-1.8.patch
-Patch1003:      beanshell-2.0b6-getpeer.patch
 BuildRequires:  ant
 BuildRequires:  bsf
 BuildRequires:  bsf-javadoc
@@ -94,12 +93,6 @@ Scripting for Java (BeanShell Version 2.x) (demo and samples).
 %patch3 -p1
 %patch1001 -p1
 %patch1002 -p1
-%patch1003 -p1
-for j in $(find . -name "*.jar"); do
-    rm $j
-done
-# Remove bundled javax.script files under Sun's proprietary license
-find engine/javax-src/javax/script/ -maxdepth 1 -type 'f' | xargs rm
 
 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl