From 050af7f7f1d9bd70f49b56ffe220a2969ae22f8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:57:46 +0000 Subject: [PATCH 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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