From 7643bad05f7c58bb8fe9086869c98e3934fa12b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:16:54 +0000 Subject: [PATCH 01/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index e0a88dd..471df5e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -217,6 +217,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.1-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.9.1-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 31ff529f152cb0e9059576cddce61361178a1601 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Dec 2021 12:01:05 +0100 Subject: [PATCH 02/16] Drop sdljava-run-bsh.sh demo Drop now unnecessary bsh Requires --- sdljava.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 471df5e..3a2ae4d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -32,7 +32,6 @@ BuildRequires: SDL_ttf-devel BuildRequires: javapackages-local BuildRequires: ant BuildRequires: swig -BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: %{_bindir}/ruby @@ -42,7 +41,6 @@ BuildRequires: font(dejavusans) fontconfig Requires: java Requires: javapackages-filesystem -Requires: bsh Requires: jdom %description @@ -98,8 +96,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 bsh & jdom -build-jar-repository -p lib jdom bsh +# use system versions of jdom +build-jar-repository -p lib jdom # copy the Linux Makefiles into place cp etc/build/linux/Makefile src/sdljava/native @@ -184,6 +182,7 @@ 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 }'` @@ -217,6 +216,10 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Thu Dec 2 2021 Hans de Goede - 0.9.1-53 +- Drop sdljava-run-bsh.sh demo +- Drop now unnecessary bsh Requires + * Fri Jul 23 2021 Fedora Release Engineering - 0.9.1-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2410884116061ff53ef20407806c9aadf2592ce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:35:37 +0000 Subject: [PATCH 03/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3a2ae4d..8c4dd46 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.9.1-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 2 2021 Hans de Goede - 0.9.1-53 - Drop sdljava-run-bsh.sh demo - Drop now unnecessary bsh Requires From b1b82c9d07b371ac6c40cc5895463abedfa5ecff Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:09:31 +0100 Subject: [PATCH 04/16] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 8c4dd46..c8236db 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Feb 05 2022 Jiri Vanek - 0.9.1-55 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 0.9.1-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 54a6e88df818a0cd350ad9302f2a14ae819ddfd8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 21:09:40 -0700 Subject: [PATCH 05/16] Rebuild for glew 2.2 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index c8236db..ed27e1e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 55%{?dist} +Release: 56%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Thu Feb 10 2022 Orion Poplawski - 0.9.1-56 +- Rebuild for glew 2.2 + * Sat Feb 05 2022 Jiri Vanek - 0.9.1-55 - Rebuilt for java-17-openjdk as system jdk From 7e0241216ebca790fd9fd3c7336b759eae8f4932 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 Jul 2022 22:02:58 +0200 Subject: [PATCH 06/16] sdljava provides java bindings for SDL and the JDK is no longer build on i686, disable i686 builds (rhbz#2104100) --- sdljava.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index ed27e1e..96589f5 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 56%{?dist} +Release: 57%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -38,6 +38,8 @@ 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 Requires: javapackages-filesystem @@ -71,10 +73,7 @@ Demonstrations and samples for %{name}. %prep -%setup -q -%patch0 -p1 -z .regen -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 find -name '*.jar' -or -name '*.class' -or -name '*.bat' -name '*.so' -delete rm -r etc/build/gljava/windows etc/build/windows @@ -216,6 +215,10 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 16 2022 Hans de Goede - 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 - 0.9.1-56 - Rebuild for glew 2.2 From ca03a2e043d9f93d4045cf9b0d39f6b8e08d8e8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:16:58 +0000 Subject: [PATCH 07/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 96589f5..3509235 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.1-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 16 2022 Hans de Goede - 0.9.1-57 - sdljava provides java bindings for SDL and the JDK is no longer build on i686, disable i686 builds (rhbz#2104100) From 5d875117c4c31c2e17bde9aeb4d1053c136964c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:54:38 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3509235..d25186c 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.9.1-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.9.1-58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0fc2bbbc54fce47f65a8cc90ca68ac84fd5352d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:18:36 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index d25186c..5407f18 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 59%{?dist} +Release: 60%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.9.1-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.9.1-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6371d3550f6c6bebbd7a9e1ae281314a0e531143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:24:29 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 5407f18..cd3236a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.9.1-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.9.1-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a66c12f39df69972b497bf46773d849c021e5079 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:08:18 +0100 Subject: [PATCH 11/16] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index cd3236a..ecac77a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Tue Feb 27 2024 Jiri Vanek - 0.9.1-62 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 0.9.1-61 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 24b282bd9f27671254ae9f2a6521239e357522db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:06:44 +0000 Subject: [PATCH 12/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index ecac77a..ae139c0 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 62%{?dist} +Release: 63%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.9.1-63 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 0.9.1-62 - Rebuilt for java-21-openjdk as system jdk From 8b167dcb119be306c0ea8b7c2b77e8ce9084b60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:50:35 +0200 Subject: [PATCH 13/16] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sdljava.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index ae139c0..17613f7 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,9 +7,10 @@ Name: sdljava Version: 0.9.1 -Release: 63%{?dist} +Release: 64%{?dist} Summary: Java binding to the SDL API -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-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 @@ -215,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Wed Sep 04 2024 Miroslav Suchý - 0.9.1-64 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.9.1-63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0d0c6d294d23f0799c52c3dddb5104e8c5b2ed90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:18:06 +0000 Subject: [PATCH 14/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 17613f7..43b9c53 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 64%{?dist} +Release: 65%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.1-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 0.9.1-64 - convert license to SPDX From 277e2459a072596f8cf31ee05f8f069a3a1c1b27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:05:28 +0000 Subject: [PATCH 15/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 43b9c53..8887c8b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 65%{?dist} +Release: 66%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.1-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.9.1-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 88dcd0ea3fffd87f771a4a481fbd9a8dc6ba9136 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:23:31 +0200 Subject: [PATCH 16/16] 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. --- sdljava.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 8887c8b..fc8380d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 66%{?dist} +Release: 67%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -30,8 +30,8 @@ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_ttf-devel -BuildRequires: javapackages-local -BuildRequires: ant +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 BuildRequires: swig BuildRequires: jdom BuildRequires: xml-commons-apis @@ -42,7 +42,7 @@ BuildRequires: font(dejavusans) fontconfig # sdljava provides java bindings for SDL, so it can only run on java_arches ExclusiveArch: %{java_arches} -Requires: java +Requires: java-25 Requires: javapackages-filesystem Requires: jdom @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Mon Jul 28 2025 jiri vanek - 0.9.1-67 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 0.9.1-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild