sdljava.spec

@@ -7,10 +7,9 @@
 
 Name:           sdljava
 Version:        0.9.1
-Release:        67%{?dist}
+Release:        52%{?dist}
 Summary:        Java binding to the SDL API
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPLv2+
 URL:            http://sdljava.sourceforge.net/
 # this is http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.gz
 # with the included Microsoft Copyrighted Arial fonts removed
@@ -30,20 +29,20 @@ BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel
 
-BuildRequires:  javapackages-local-openjdk25
-BuildRequires:  ant-openjdk25 
+BuildRequires:  javapackages-local
+BuildRequires:  ant
 BuildRequires:  swig
+BuildRequires:  bsh
 BuildRequires:  jdom
 BuildRequires:  xml-commons-apis
 BuildRequires:  %{_bindir}/ruby
 BuildRequires:  rubygems
 # To generate the replacement font symlinks for the sdljava-demo testdata
 BuildRequires:  font(dejavusans) fontconfig
-# sdljava provides java bindings for SDL, so it can only run on java_arches
-ExclusiveArch:  %{java_arches}
 
-Requires:       java-25
+Requires:       java
 Requires:       javapackages-filesystem
+Requires:       bsh
 Requires:       jdom
 
 %description
@@ -74,7 +73,10 @@ Demonstrations and samples for %{name}.
 
 
 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1 -z .regen
+%patch1 -p1
+%patch2 -p1
 
 find -name '*.jar' -or -name '*.class' -or -name '*.bat' -name '*.so' -delete
 rm -r etc/build/gljava/windows etc/build/windows
@@ -96,8 +98,8 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
 find ./testsrc -name '*.java' | xargs sed -i \
   -e 's|testdata|%{_datadir}/%{name}/testdata|g'
 
-# use system versions of jdom
-build-jar-repository -p lib jdom
+# use system versions of bsh & jdom
+build-jar-repository -p lib jdom bsh
 
 # copy the Linux Makefiles into place
 cp etc/build/linux/Makefile src/sdljava/native
@@ -182,7 +184,6 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 pushd bin
 rm runtest.sh
-rm run-bsh.sh
 for i in `ls -1 *.sh`; do
    sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i
    FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'`
@@ -216,53 +217,6 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \
 
 
 %changelog
-* Mon Jul 28 2025 jiri vanek <jvanek@redhat.com> - 0.9.1-67
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-66
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-65
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 0.9.1-64
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-63
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0.9.1-62
-- Rebuilt for java-21-openjdk as system jdk
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-61
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-60
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-59
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-58
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jul 16 2022 Hans de Goede <hdegoede@redhat.com> - 0.9.1-57
-- sdljava provides java bindings for SDL and the JDK is no longer
-  build on i686, disable i686 builds (rhbz#2104100)
-
-* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.9.1-56
-- Rebuild for glew 2.2
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.9.1-55
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-54
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Dec  2 2021 Hans de Goede <hdegoede@redhat.com> - 0.9.1-53
-- Drop sdljava-run-bsh.sh demo
-- Drop now unnecessary bsh Requires
-
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-52
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild