diff --git a/bsh.spec b/bsh.spec index 9b4192e..6f60e19 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,13 +30,13 @@ Name: bsh Version: 2.1.0 -Release: 9%{?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 @@ -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 @@ -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 @@ -161,6 +161,30 @@ 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