From 84d3404ab70ef7fc55188ce5c3388b572db86aa9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:57:03 +0000 Subject: [PATCH 01/20] - 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 02/20] - 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 03/20] 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 04/20] - 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 05/20] 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 06/20] 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 07/20] 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 08/20] 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 09/20] 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 10/20] 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 11/20] 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 12/20] 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 13/20] 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 14/20] 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 15/20] 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 16/20] 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 17/20] 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 18/20] 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 19/20] 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 20/20] 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