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 9754564..6f60e19 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -30,13 +30,13 @@
Name: bsh
Version: 2.1.0
-Release: 1%{?dist}
+Release: 17%{?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: ASL 2.0 and BSD and Public Domain
+License: Apache-2.0 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
@@ -51,16 +51,17 @@ Patch0: 0000-source-target-1.8.patch
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
@@ -109,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
@@ -160,6 +161,54 @@ 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
+
+* 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
+
+* 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
+
+* 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
+
+* 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
+
+* 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
+
+* 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
+
+* 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
+
* Mon Feb 01 2021 Fabio Valentini - 0:2.1.0-1
- Update to version 2.1.0.