Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Jiri Vanek
a428385fe9 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.
2025-07-28 18:51:32 +02:00
Fedora Release Engineering
b4d723aae1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:54:17 +00:00
Fedora Release Engineering
4bc03fd08a Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 12:55:11 +00:00
Miroslav Suchý
c1e9a7c682 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
2024-07-30 06:24:52 +00:00
Fedora Release Engineering
1f99d03b0d Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 18:38:19 +00:00
Marian Koncek
4408c774e3 Use new %patch macro 2024-05-22 12:54:32 +02:00
Marian Koncek
1e394329bf Use HTTPS in the URL field 2024-05-22 12:54:32 +02:00
Marian Koncek
a3e370d071 Fix license field 2024-05-22 12:54:28 +02:00
Jiri Vanek
ac391cadc9 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 15:02:34 +01:00
Fedora Release Engineering
75c5351e66 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-23 00:51:29 +00:00
Fedora Release Engineering
d0a88ee665 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 14:44:16 +00:00
Fedora Release Engineering
050af7f7f1 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 14:57:46 +00:00
Fedora Release Engineering
324e201c55 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 23:11:55 +00:00
Fedora Release Engineering
906d9f805d Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 22:17:37 +00:00
Jiri
fb49f305ed Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 14:39:17 +02:00
Jiri
6614e2e1fa Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-05 19:47:46 +01:00
Fedora Release Engineering
42e2b4ed77 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 22:37:59 +00:00
Hans de Goede
b802988cc2 Fix building with Java 17 2021-12-02 12:06:57 +01:00
Fedora Release Engineering
3027811fce - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 18:54:22 +00:00
Fedora Release Engineering
84d3404ab7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 13:57:03 +00:00
2 changed files with 90 additions and 8 deletions

View file

@ -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 @@
<property name="file" value=""/>
- <property name="ant.build.javac.target" value="1.6" />
- <property name="ant.build.javac.source" value="1.6" />
+ <property name="ant.build.javac.target" value="1.8" />
+ <property name="ant.build.javac.source" value="1.8" />
<property name="version" value="2.1.0"/>
<property name="deprecation" value="on"/>
<property name="Specification-Title" value="BeanShell" />
@@ -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"
>
<classpath>
<fileset refid="lib-fileset"/>
@@ -213,8 +213,8 @@
debug="on"
includes="**/*.java"
excludes="${excludes},**/bak/**"
- source="1.6"
- target="1.6"
+ source="1.8"
+ target="1.8"
>
<classpath>
@ -22,3 +44,14 @@ index 8542245..6179cfa 100644
use="true"
windowtitle="BeanShell ${version}"
doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
@@ -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"
>
<classpath>
<path refid="test-classpath"/>

View file

@ -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 <jvanek@redhat.com> - 0:2.1.0-17
- Rebuilt for java-25-openjdk as preffered jdk
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed May 22 2024 Marian Koncek <mkoncek@redhat.com> - 0:2.1.0-13
- Fix license field
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-12
- Rebuilt for java-21-openjdk as system jdk
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-6
- Rebuilt for Drop i686 JDKs
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-5
- Rebuilt for java-17-openjdk as system jdk
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 2 2021 Hans de Goede <hdegoede@redhat.com> - 0:2.1.0-3
- Fix building with Java 17
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Feb 01 2021 Fabio Valentini <decathorpe@gmail.com> - 0:2.1.0-1
- Update to version 2.1.0.