From 7fad1b4523dbe9e5702ab28913d5a0b81da4c6f3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 21 Jul 2016 14:52:08 +0200 Subject: [PATCH 01/46] Replace perl usage with sed --- bsh.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/bsh.spec b/bsh.spec index 3a162f1..786d51a 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 34%{?dist} +Release: 35%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -45,7 +45,10 @@ Source3: %{name}-desktop.desktop Patch0: %{name}-build.patch Patch1: %{name}-xsl-fixes.patch BuildRequires: java-devel -BuildRequires: ant, bsf, ImageMagick, desktop-file-utils +BuildRequires: ant +BuildRequires: bsf +BuildRequires: ImageMagick +BuildRequires: desktop-file-utils BuildRequires: servlet Requires: java-headless Requires: bsf @@ -54,20 +57,20 @@ BuildArch: noarch %description BeanShell is a small, free, embeddable, Java source interpreter with -object scripting language features, written in Java. BeanShell +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 +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 +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 +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 +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 +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. @@ -165,7 +168,7 @@ convert src/bsh/util/lib/icon.gif \ # demo for i in `find tests -name \*.bsh`; do - perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i + sed -ri '1s,^#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i if head -1 $i | grep '#!/usr/bin/env %{_bindir}/%{name}' >/dev/null; then chmod 755 $i fi @@ -239,6 +242,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Thu Jul 21 2016 Michael Simacek - 0:1.3.0-35 +- Replace perl usage with sed + * Wed Feb 03 2016 Fedora Release Engineering - 0:1.3.0-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 746caad2229a2d2740fadfc6b3f925c9dcd699d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 13 Oct 2016 00:47:10 +0300 Subject: [PATCH 02/46] Switch to jline 2.x in -utils, mark License.txt as %license https://bugzilla.redhat.com/show_bug.cgi?id=1384236 Signed-off-by: Mikolaj Izdebski --- bsh.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bsh.spec b/bsh.spec index 786d51a..a1d6580 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 35%{?dist} +Release: 36%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -98,7 +98,7 @@ Demonstrations and samples for %{name}. %package utils Summary: %{name} utilities Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jline1 +Requires: jline Provides: %{name}-desktop = %{epoch}:%{version}-%{release} %description utils @@ -197,7 +197,7 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap # scripts install -d $RPM_BUILD_ROOT%{_bindir} -%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true +%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF @@ -218,18 +218,18 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f .mfiles -%doc src/License.txt +%license src/License.txt %doc src/Changes.html src/README.txt %{_javadir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps %files manual -%doc src/License.txt +%license src/License.txt %doc docs/* %files javadoc -%doc src/License.txt +%license src/License.txt %{_javadocdir}/%{name} %files demo @@ -242,6 +242,10 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Wed Oct 12 2016 Ville Skyttä - 0:1.3.0-36 +- Switch to jline 2.x in -utils +- Mark License.txt as %%license + * Thu Jul 21 2016 Michael Simacek - 0:1.3.0-35 - Replace perl usage with sed @@ -408,7 +412,7 @@ fi - remove bsf patch (fixed upstream) - add epoch to demo package Requires -* Fri Apr 12 2003 David Walluck 0:1.2-0.b8.4jpp +* Sat Apr 12 2003 David Walluck 0:1.2-0.b8.4jpp - fix strange permissions * Fri Apr 11 2003 David Walluck 0:1.2-0.b8.3jpp From 9a27cb9c42bea47dc8401212aeeaadeca995c72a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 23 Nov 2016 17:49:36 +0100 Subject: [PATCH 03/46] Update to upstream version 2.0.b6 --- .gitignore | 1 + bsh-1.3.0.pom | 8 -- bsh-bsf-1.3.0.pom | 8 -- bsh-build.patch | 54 ------------ bsh-xsl-fixes.patch | 34 ------- bsh.spec | 209 +++++++++++++++----------------------------- sources | 2 +- 7 files changed, 73 insertions(+), 243 deletions(-) delete mode 100644 bsh-1.3.0.pom delete mode 100644 bsh-bsf-1.3.0.pom delete mode 100644 bsh-build.patch delete mode 100644 bsh-xsl-fixes.patch diff --git a/.gitignore b/.gitignore index 3128130..112da74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bsh-1.3.0-src.tar.bz2 +/2.0b6.tar.gz diff --git a/bsh-1.3.0.pom b/bsh-1.3.0.pom deleted file mode 100644 index 2fdc81a..0000000 --- a/bsh-1.3.0.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - bsh - bsh - Beanshell - 1.3.0 - diff --git a/bsh-bsf-1.3.0.pom b/bsh-bsf-1.3.0.pom deleted file mode 100644 index ba753f0..0000000 --- a/bsh-bsf-1.3.0.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - bsh - bsh-bsf - Beanshell BSFEngine - 1.3.0 - diff --git a/bsh-build.patch b/bsh-build.patch deleted file mode 100644 index 31a2332..0000000 --- a/bsh-build.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- BeanShell/build.xml.orig 2004-01-20 19:12:20.888557245 -0500 -+++ BeanShell/build.xml 2004-01-20 19:13:36.150184282 -0500 -@@ -103,50 +103,7 @@ - value="docs/manual/bshcommands-bshdoc.xml"/> - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - - - -- -+ - - -- -+ - -