From 1e2d8046bfb825b3a1694ca1e3a7738a2b24c485 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:57:20 +0000 Subject: [PATCH 01/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 960bf21..968bc20 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 13.%{reltag}%{?dist} +Release: 14.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -170,6 +170,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0:2.0-14.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 03 2018 Michael Simacek - 0:2.0-13.b6 - Remove proprietary files from tarball From 246337700fc1163b804bbefcb063f10c444c50b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:36:46 +0000 Subject: [PATCH 02/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 968bc20..3229d3a 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 14.%{reltag}%{?dist} +Release: 15.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -170,6 +170,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0:2.0-15.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0:2.0-14.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 41ee177a1dc7b28e42d8e7ee0e08c64f8551f66b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 13:20:01 +0000 Subject: [PATCH 03/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 3229d3a..8995509 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 15.%{reltag}%{?dist} +Release: 16.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -170,6 +170,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0:2.0-16.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0:2.0-15.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8ba2c233be0da9ac8f6bffa82079a47a9b0d8574 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 16:53:59 +0200 Subject: [PATCH 04/30] Rebuilt for JDK-11 --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 8995509..fb7a928 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 16.%{reltag}%{?dist} +Release: 17.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -170,6 +170,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Fri Jul 10 2020 Jiri Vanek - 0:2.0-17.b6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 0:2.0-16.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c218a3c73e9a87adfb17fa1f14b2effc5df60ce6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 20 Jul 2020 21:38:46 +0200 Subject: [PATCH 05/30] adjustments for Java 11 compatibility --- 0000-source-target-1.8.patch | 35 ++++++++++++++++++++++++++++++++ 0001-java-11-compatibility.patch | 27 ++++++++++++++++++++++++ bsh.spec | 13 +++++++++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 0000-source-target-1.8.patch create mode 100644 0001-java-11-compatibility.patch diff --git a/0000-source-target-1.8.patch b/0000-source-target-1.8.patch new file mode 100644 index 0000000..bb33137 --- /dev/null +++ b/0000-source-target-1.8.patch @@ -0,0 +1,35 @@ +From 62ea7bb2656177fbb61d94b90d9a526990876cb8 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 20 Jul 2020 21:27:20 +0200 +Subject: [PATCH 0/1] source / target 1.8 + +--- + build.xml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index 4f400dc..0d28a7f 100644 +--- a/build.xml ++++ b/build.xml +@@ -170,7 +170,8 @@ + deprecation="${deprecation}" + optimize="on" + debug="on" +- target="1.5" ++ source="1.8" ++ target="1.8" + includes="**/*.java" + excludes="${excludes},**/bak/**" + > +@@ -213,7 +214,7 @@ + destdir="${javadoc-dir}" + author="true" + version="true" +- source="1.5" ++ source="1.8" + use="true" + windowtitle="BeanShell ${version}" + doctitle="<h1>BeanShell ${version}<h1>" +-- +2.26.2 + diff --git a/0001-java-11-compatibility.patch b/0001-java-11-compatibility.patch new file mode 100644 index 0000000..36271b8 --- /dev/null +++ b/0001-java-11-compatibility.patch @@ -0,0 +1,27 @@ +From 9b83372c64f30f44bd56696ae6adcbe6a83e1e2f Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 20 Jul 2020 21:28:13 +0200 +Subject: [PATCH 1/1] java 11 compatibility + +--- + src/bsh/util/AWTConsole.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bsh/util/AWTConsole.java b/src/bsh/util/AWTConsole.java +index e88fbff..fbb237b 100644 +--- a/src/bsh/util/AWTConsole.java ++++ b/src/bsh/util/AWTConsole.java +@@ -214,8 +214,8 @@ public class AWTConsole extends TextArea + Great. What a piece of crap. + */ + public void setCaretPosition( int pos ) { +- ((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( +- pos + countNLs() ); ++ //((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( ++ // pos + countNLs() ); + } + + /* +-- +2.26.2 + diff --git a/bsh.spec b/bsh.spec index fb7a928..ae5cf67 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 17.%{reltag}%{?dist} +Release: 18.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -48,6 +48,12 @@ Source1: %{name}-desktop.desktop # Remove code marked as SUN PROPRIETARY/CONFIDENTAIL Source2: generate-tarball.sh +# compatibility with Java 11: +# - set javac / javadoc source and target values to 1.8 +Patch0: 0000-source-target-1.8.patch +# - remove references to invisible symbols and methods +Patch1: 0001-java-11-compatibility.patch + BuildRequires: javapackages-local BuildRequires: ant BuildRequires: bsf @@ -109,6 +115,8 @@ This package provides %{summary}. %prep %setup -q -n beanshell-%{version}%{reltag} +%patch0 -p1 +%patch1 -p1 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl @@ -170,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Jul 20 2020 Fabio Valentini - 0:2.0-18.b6 +- Make adjustments for Java 11 compatibility. + * Fri Jul 10 2020 Jiri Vanek - 0:2.0-17.b6 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 07f54b87562962e3c5c92c2a93484af16fb167da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:25:17 +0000 Subject: [PATCH 06/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index ae5cf67..ba97523 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 18.%{reltag}%{?dist} +Release: 19.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -178,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0:2.0-19.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 20 2020 Fabio Valentini - 0:2.0-18.b6 - Make adjustments for Java 11 compatibility. From 32b8f1e101180e6f1eb65e6a3c3a322bb2cf98d4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Dec 2020 11:54:49 -0700 Subject: [PATCH 07/30] Change jline Requires to jline2 --- bsh.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bsh.spec b/bsh.spec index ba97523..11a112b 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 19.%{reltag}%{?dist} +Release: 20.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -67,7 +67,7 @@ BuildRequires: desktop-file-utils Requires: java-headless Requires: bsf -Requires: jline +Requires: jline2 # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -152,7 +152,7 @@ install -m 644 dist/bshservlet-wbsh.war %{buildroot}%{_datadir}/%{name}/webapps # scripts install -d %{buildroot}%{_bindir} -%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true +%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline2/jline %{name} true %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" bsh bsh-console true echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc @@ -178,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Dec 14 2020 Jerry James - 0:2.0-20.b6 +- Change jline Requires to jline2 + * Mon Jul 27 2020 Fedora Release Engineering - 0:2.0-19.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 88db4b167fec537c517c1b0d607d27a11b0d23ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:25:18 +0000 Subject: [PATCH 08/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 11a112b..4e6762e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 20.%{reltag}%{?dist} +Release: 21.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -178,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0:2.0-21.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Jerry James - 0:2.0-20.b6 - Change jline Requires to jline2 From 85bc37d00ed47974db0b1edfbde0359a3c4ab27f Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 27 Jan 2021 14:57:33 +0100 Subject: [PATCH 09/30] Don't build the desktop support on RHEL 8+ as ImageMagick isn't available there. --- bsh.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 4e6762e..c37c092 100644 --- a/bsh.spec +++ b/bsh.spec @@ -29,11 +29,15 @@ # %global reltag b6 +%if 0%{?rhel} >= 8 +%bcond_with desktop +%else %bcond_without desktop +%endif Name: bsh Version: 2.0 -Release: 21.%{reltag}%{?dist} +Release: 22.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -178,6 +182,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jan 27 2021 Tomas Popela - 0:2.0-22.b6 +- Don't build the desktop support on RHEL 8+ as ImageMagick isn't available there. + * Tue Jan 26 2021 Fedora Release Engineering - 0:2.0-21.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e93dc6afb5a24a87fd328699b5ce7cb4e61169d4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 1 Feb 2021 14:54:32 +0100 Subject: [PATCH 10/30] update to version 2.1.0 --- .gitignore | 1 + 0000-source-target-1.8.patch | 31 +++++++------------- bsh-desktop.desktop | 9 ------ bsh.spec | 55 ++++++++++++------------------------ generate-tarball.sh | 15 +++++----- sources | 2 +- 6 files changed, 37 insertions(+), 76 deletions(-) delete mode 100644 bsh-desktop.desktop diff --git a/.gitignore b/.gitignore index 02b4714..ef8d6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bsh-1.3.0-src.tar.bz2 /2.0b6.tar.gz /bsh-2.0-b6.tar.gz +/bsh-2.1.0.tar.gz diff --git a/0000-source-target-1.8.patch b/0000-source-target-1.8.patch index bb33137..87cbb32 100644 --- a/0000-source-target-1.8.patch +++ b/0000-source-target-1.8.patch @@ -1,35 +1,24 @@ -From 62ea7bb2656177fbb61d94b90d9a526990876cb8 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Mon, 20 Jul 2020 21:27:20 +0200 -Subject: [PATCH 0/1] source / target 1.8 - ---- - build.xml | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - diff --git a/build.xml b/build.xml -index 4f400dc..0d28a7f 100644 +index 8542245..6179cfa 100644 --- a/build.xml +++ b/build.xml -@@ -170,7 +170,8 @@ - deprecation="${deprecation}" - optimize="on" +@@ -178,8 +178,8 @@ debug="on" -- target="1.5" -+ source="1.8" -+ target="1.8" includes="**/*.java" excludes="${excludes},**/bak/**" +- source="1.6" +- target="1.6" ++ source="1.8" ++ target="1.8" > -@@ -213,7 +214,7 @@ + + +@@ -255,7 +255,7 @@ destdir="${javadoc-dir}" author="true" version="true" -- source="1.5" +- source="1.6" + source="1.8" use="true" windowtitle="BeanShell ${version}" doctitle="<h1>BeanShell ${version}<h1>" --- -2.26.2 - diff --git a/bsh-desktop.desktop b/bsh-desktop.desktop deleted file mode 100644 index da0f1ed..0000000 --- a/bsh-desktop.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=BeanShell Desktop -Exec=bsh-desktop -Icon=bsh -Terminal=false -Type=Application -StartupWMClass=bsh-Console -Categories=Development;Java; -Version=1.0 diff --git a/bsh.spec b/bsh.spec index c37c092..9754564 100644 --- a/bsh.spec +++ b/bsh.spec @@ -28,26 +28,18 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%global reltag b6 -%if 0%{?rhel} >= 8 -%bcond_with desktop -%else -%bcond_without desktop -%endif - Name: bsh -Version: 2.0 -Release: 22.%{reltag}%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ # bundled asm is BSD # bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain License: ASL 2.0 and BSD and Public Domain -BuildArch: noarch + # ./generate-tarball.sh -Source0: %{name}-%{version}-%{reltag}.tar.gz -Source1: %{name}-desktop.desktop +Source0: %{name}-%{version}.tar.gz # Remove bundled jars which cannot be easily verified for licensing # Remove code marked as SUN PROPRIETARY/CONFIDENTAIL Source2: generate-tarball.sh @@ -58,25 +50,23 @@ Patch0: 0000-source-target-1.8.patch # - remove references to invisible symbols and methods Patch1: 0001-java-11-compatibility.patch -BuildRequires: javapackages-local +BuildArch: noarch + BuildRequires: ant BuildRequires: bsf -BuildRequires: junit -BuildRequires: javacc BuildRequires: glassfish-servlet-api -%if %{with desktop} -BuildRequires: ImageMagick -BuildRequires: desktop-file-utils -%endif +BuildRequires: javacc +BuildRequires: javapackages-local +BuildRequires: junit -Requires: java-headless Requires: bsf +Requires: java-headless Requires: jline2 + # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools - Provides: %{name}-utils = %{epoch}:%{version}-%{release} Obsoletes: %{name}-utils < 0:2.0 Obsoletes: %{name}-demo < 0:2.0 @@ -118,7 +108,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n beanshell-%{version}%{reltag} +%setup -q -n beanshell-%{version} %patch0 -p1 %patch1 -p1 @@ -135,19 +125,10 @@ build-jar-repository lib bsf javacc junit glassfish-servlet-api ant test dist %install -%mvn_artifact pom.xml dist/%{name}-%{version}%{reltag}.jar +%mvn_artifact pom.xml dist/%{name}-%{version}.jar %mvn_install -J javadoc -%if %{with desktop} -# menu entry -desktop-file-install --mode=644 \ - --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -install -d -m 755 %{buildroot}%{_datadir}/pixmaps -convert src/bsh/util/lib/icon.gif \ - %{buildroot}%{_datadir}/pixmaps/bsh.png -%endif - install -d -m 755 %{buildroot}%{_datadir}/%{name} install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps install -m 644 dist/bshservlet.war %{buildroot}%{_datadir}/%{name}/webapps @@ -165,12 +146,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %files -f .mfiles %license LICENSE NOTICE %doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html + %attr(0755,root,root) %{_bindir}/%{name}* -%if %{with desktop} -%{_datadir}/applications/%{name}-desktop.desktop -%{_datadir}/pixmaps/%{name}.png -%endif -%{_datadir}/%{name} +%{_datadir}/%{name}/ %files manual %doc docs/manual/html @@ -182,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Feb 01 2021 Fabio Valentini - 0:2.1.0-1 +- Update to version 2.1.0. + * Wed Jan 27 2021 Tomas Popela - 0:2.0-22.b6 - Don't build the desktop support on RHEL 8+ as ImageMagick isn't available there. diff --git a/generate-tarball.sh b/generate-tarball.sh index bf091f9..4f222cc 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -3,23 +3,22 @@ set -e name=bsh version="$(sed -n 's/Version:\s*//p' *.spec)" -reltag="$(sed -n 's/%global\s*reltag\s*//p' *.spec)" # RETRIEVE -wget "https://github.com/beanshell/beanshell/archive/${version}${reltag}.tar.gz" -O "${name}-${version}-${reltag}.orig.tar.gz" +wget "https://github.com/beanshell/beanshell/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp cd tarball-tmp -tar xf "../${name}-${version}-${reltag}.orig.tar.gz" +tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL rm -r */lib -find -name '*.jar' -delete -find -name '*.class' -delete +find -name '*.jar' -print -delete +find -name '*.class' -print -delete # Files marked as SUN PROPRIETARY/CONFIDENTAIL -rm -r */engine/javax-src +rm -rv */engine/javax-src -tar cf "../${name}-${version}-${reltag}.tar.gz" * +tar cf "../${name}-${version}.tar.gz" * cd .. -rm -r tarball-tmp "${name}-${version}-${reltag}.orig.tar.gz" +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/sources b/sources index c02c0d3..49df674 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bsh-2.0-b6.tar.gz) = 22e920fa78d2117cc27074f12a12246cb2923b1d308736b2ed5fd2faa9bbc8b77b4991abc862097cce4e9de473c17a9d9a85ee5bdab5462f4a92c64c3d49bfc1 +SHA512 (bsh-2.1.0.tar.gz) = 4cee4ffc97e0214b0ef3fbfbfacc3ec55e8bbf7b26c36e51fd03f087c9317501e4d975f4b1c4b1d04afd0a9120789c45f8ea9390598e19802bc063d367bd247e From 84d3404ab70ef7fc55188ce5c3388b572db86aa9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:57:03 +0000 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3027811fce386d8af080157c249dea869cb914f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:54:22 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 9754564..9b753b8 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -160,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0:2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 01 2021 Fabio Valentini - 0:2.1.0-1 - Update to version 2.1.0. From b802988cc26cf929953d7ff5ebd5e4d0626e0cb8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Dec 2021 12:06:57 +0100 Subject: [PATCH 13/30] Fix building with Java 17 --- 0000-source-target-1.8.patch | 33 +++++++++++++++++++++++++++++++++ bsh.spec | 5 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/0000-source-target-1.8.patch b/0000-source-target-1.8.patch index 87cbb32..5fb7dfd 100644 --- a/0000-source-target-1.8.patch +++ b/0000-source-target-1.8.patch @@ -2,6 +2,17 @@ diff --git a/build.xml b/build.xml index 8542245..6179cfa 100644 --- a/build.xml +++ b/build.xml +@@ -16,8 +16,8 @@ + + + +- +- ++ ++ + + + @@ -178,8 +178,8 @@ debug="on" includes="**/*.java" @@ -9,6 +20,17 @@ index 8542245..6179cfa 100644 - source="1.6" - target="1.6" + source="1.8" ++ target="1.8" + > + + +@@ -213,8 +213,8 @@ + debug="on" + includes="**/*.java" + excludes="${excludes},**/bak/**" +- source="1.6" +- target="1.6" ++ source="1.8" + target="1.8" > @@ -22,3 +44,14 @@ index 8542245..6179cfa 100644 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" + > + + diff --git a/bsh.spec b/bsh.spec index 9b753b8..3cc46eb 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -160,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Thu Dec 2 2021 Hans de Goede - 0:2.1.0-3 +- Fix building with Java 17 + * Wed Jul 21 2021 Fedora Release Engineering - 0:2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 42e2b4ed774cc15d1673d026e5f2473d1790f098 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:37:59 +0000 Subject: [PATCH 14/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 3cc46eb..7a72975 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -160,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0:2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 2 2021 Hans de Goede - 0:2.1.0-3 - Fix building with Java 17 From 6614e2e1facbb27b577889051b5ede9e9c4df2e8 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:47:46 +0100 Subject: [PATCH 15/30] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 7a72975..a7c3349 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -160,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Sat Feb 05 2022 Jiri Vanek - 0:2.1.0-5 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 0:2.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fb49f305edf4ba267f179725e34009df5505fd3b Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:39:17 +0200 Subject: [PATCH 16/30] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- bsh.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index a7c3349..6916ff4 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -51,6 +51,7 @@ Patch0: 0000-source-target-1.8.patch Patch1: 0001-java-11-compatibility.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: bsf @@ -160,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Fri Jul 08 2022 Jiri Vanek - 0:2.1.0-6 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 0:2.1.0-5 - Rebuilt for java-17-openjdk as system jdk From 906d9f805dc44d51d6f7bb08c3b788fbe71de811 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:17:37 +0000 Subject: [PATCH 17/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 6916ff4..4ab1839 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0:2.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 0:2.1.0-6 - Rebuilt for Drop i686 JDKs From 324e201c553555bb9b6d028cf928aa380f95e22c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:11:55 +0000 Subject: [PATCH 18/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 4ab1839..1a27ca1 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0:2.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0:2.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 050af7f7f1d9bd70f49b56ffe220a2969ae22f8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:57:46 +0000 Subject: [PATCH 19/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 1a27ca1..9b4192e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0:2.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0:2.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d0a88ee665e37b5c5813c6b02fd60e829e456a6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:44:16 +0000 Subject: [PATCH 20/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 9b4192e..f31a4ad 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0:2.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0:2.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 75c5351e66dc133c7ed4064cf1cfb2d88db09021 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:51:29 +0000 Subject: [PATCH 21/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index f31a4ad..12e4210 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 0:2.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0:2.1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ac391cadc9632eb81f4c77089a66867ce6b96c0b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:02:34 +0100 Subject: [PATCH 22/30] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 12e4210..bb5621d 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 0:2.1.0-12 +- Rebuilt for java-21-openjdk as system jdk + * Tue Jan 23 2024 Fedora Release Engineering - 0:2.1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a3e370d071f80dabcd97ad58611b1e1bb9e818de Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 22 May 2024 12:52:59 +0200 Subject: [PATCH 23/30] Fix license field --- bsh.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index bb5621d..d50dd06 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,13 +30,13 @@ Name: bsh Version: 2.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ # bundled asm is BSD # bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain -License: ASL 2.0 and BSD and Public Domain +License: Apache-2.0 AND BSD-3-Clause AND Public Domain # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed May 22 2024 Marian Koncek - 0:2.1.0-13 +- Fix license field + * Tue Feb 27 2024 Jiri Vanek - 0:2.1.0-12 - Rebuilt for java-21-openjdk as system jdk From 1e394329bfcc2705193419bd178c66df5f0c91e7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 22 May 2024 12:53:16 +0200 Subject: [PATCH 24/30] Use HTTPS in the URL field --- bsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index d50dd06..35670ca 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Version: 2.1.0 Release: 13%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java -URL: http://www.beanshell.org/ +URL: https://beanshell.github.io/ # bundled asm is BSD # bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain License: Apache-2.0 AND BSD-3-Clause AND Public Domain From 4408c774e3e64267e02c9eaac842f40cc8f3e2a4 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 22 May 2024 12:53:33 +0200 Subject: [PATCH 25/30] Use new %patch macro --- bsh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 35670ca..0a28323 100644 --- a/bsh.spec +++ b/bsh.spec @@ -110,8 +110,8 @@ This package provides %{summary}. %prep %setup -q -n beanshell-%{version} -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl From 1f99d03b0d9ef96f9c12f5a50639bb1e4289e1ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:38:19 +0000 Subject: [PATCH 26/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 0a28323..13d0c69 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: https://beanshell.github.io/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0:2.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed May 22 2024 Marian Koncek - 0:2.1.0-13 - Fix license field From c1e9a7c68201106410899547177343a977a01f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 30 Jul 2024 06:24:52 +0000 Subject: [PATCH 27/30] Correct SPDX license Public Domain is not valid SPDX is. Using https://gitlab.com/fedora/legal/fedora-license-data/-/blob/main/data/LicenseRef-Fedora-Public-Domain.toml?ref_type=heads --- bsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 13d0c69..266ab67 100644 --- a/bsh.spec +++ b/bsh.spec @@ -36,7 +36,7 @@ Summary: Lightweight Scripting for Java URL: https://beanshell.github.io/ # bundled asm is BSD # bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain -License: Apache-2.0 AND BSD-3-Clause AND Public Domain +License: Apache-2.0 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 4bc03fd08a5999a8d54e6b44c7d09367db46926d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:55:11 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 266ab67..6f4cc2f 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: https://beanshell.github.io/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0:2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0:2.1.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b4d723aae1c9526577578160ba6452b7c3b64f54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:54:17 +0000 Subject: [PATCH 29/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 6f4cc2f..247e0d0 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: https://beanshell.github.io/ @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0:2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0:2.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a428385fe941d01bd7a3d094863474bbd9c1c9a1 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 18:51:32 +0200 Subject: [PATCH 30/30] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- bsh.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index 247e0d0..6f60e19 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 2.1.0 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: https://beanshell.github.io/ @@ -53,15 +53,15 @@ Patch1: 0001-java-11-compatibility.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: bsf BuildRequires: glassfish-servlet-api BuildRequires: javacc -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: junit Requires: bsf -Requires: java-headless +Requires: java-25-headless Requires: jline2 # Explicit javapackages-tools requires since scripts use @@ -161,6 +161,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Jul 28 2025 jiri vanek - 0:2.1.0-17 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 0:2.1.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild