From 505a689fa7971640073f4e01bbb4095f838d74ed Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:19:35 -0500 Subject: [PATCH 01/29] Remove needless use of %defattr --- sdljava.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 717c94f..3d04492 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -207,17 +207,14 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %files -%defattr(-,root,root,-) %doc README TODO docs/CHANGES_0_9_1 %{_javadir}/%{name}.jar %{_libdir}/%{name} %files javadoc -%defattr(-,root,root,-) %doc %{_javadocdir}/%{name}-%{version} %files demo -%defattr(-,root,root,-) %{_bindir}/%{name}-*.sh %{_datadir}/%{name} From 92baf7bf904c8c7814ddf8e82b3a1537a0c25d1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 05:54:16 +0000 Subject: [PATCH 02/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 3d04492..7120eca 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.9.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Michael Simacek - 0.9.1-40 - Add BR on gcc and make From 0fc33077309b3ddbb5c2117aa8ca4481f120e64f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:08:26 +0200 Subject: [PATCH 03/29] - Rebuilt for glew 2.1.0 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 7120eca..3b8b86e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 0.9.1-42 +- Rebuilt for glew 2.1.0 + * Sat Jul 14 2018 Fedora Release Engineering - 0.9.1-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8bdfe70ffd88728969f352a43e7a03a64ba5a05a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:07:13 +0000 Subject: [PATCH 04/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 3b8b86e..1c693aa 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.9.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Aug 23 2018 Nicolas Chauvet - 0.9.1-42 - Rebuilt for glew 2.1.0 From 0c07d8626632ad9d8a06697559aa892b52bd626c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 22:59:52 +0000 Subject: [PATCH 05/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 1c693aa..94c3a3b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.9.1-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 0.9.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ad8eba37d14c9546ba026737b85434ea14679e6e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 25 Nov 2019 21:31:20 +0100 Subject: [PATCH 06/29] Drop unnecessary BuildRequires: jruby Drop version prefix from javadocs installation the ghosted symlink blocking us from doing this has last shipped in Fedora 16 Update to match latest java packaging guidelines --- sdljava.rpmlintrc | 5 +++++ sdljava.spec | 31 +++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 sdljava.rpmlintrc diff --git a/sdljava.rpmlintrc b/sdljava.rpmlintrc new file mode 100644 index 0000000..02003cc --- /dev/null +++ b/sdljava.rpmlintrc @@ -0,0 +1,5 @@ +# We ship a cleaned tarbal with nonfree fonts removed +addFilter("W: invalid-url Source0: sdljava-0.9.1.tar.gz") +# The demos do not have docs / manpages, nor do they need these +addFilter("W: no-manual-page-for-binary .*") +addFilter("W: no-documentation") diff --git a/sdljava.spec b/sdljava.spec index 94c3a3b..ab4e2f8 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,11 +7,11 @@ Name: sdljava Version: 0.9.1 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ -# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# this is http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.gz # with the included Microsoft Copyrighted Arial fonts removed Source0: %{name}-%{version}.tar.gz Source1: %{name}-runtest.sh @@ -35,12 +35,10 @@ BuildRequires: swig BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis - -BuildRequires: jruby BuildRequires: %{_bindir}/ruby Requires: java -Requires: javapackages-tools +Requires: javapackages-filesystem Requires: bsh Requires: jdom @@ -68,6 +66,7 @@ Requires: /usr/share/fonts/dejavu/DejaVuSans.ttf Requires: /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf Requires: /usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf Requires: /usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf +Requires: javapackages-tools %description demo Demonstrations and samples for %{name}. @@ -113,7 +112,7 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build -# We must add -D__%{_arch}__ to swigs arguments as swig doesn't do that itself. +# We must add -D__%%{_arch}__ to swigs arguments as swig doesn't do that itself. # Special case ppc as the define is powerpc not ppc and both ppc and ppc64 # must be set for ppc64, also add -D__LONG_DOUBLE_128__ which works around # swig barfing on bits/stdlib-ldbl.h @@ -168,20 +167,18 @@ ant jar javadoc mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_javadir} -# should be just %{_javadocdir}/%{name} but that is a ghosted symlink in older -# versions and rpm does not grok replacing that with a dir -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_jnidir} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} # jars install -m 644 lib/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar # native libraries install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name} # javadoc -cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # demo scripts install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} @@ -208,11 +205,11 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %files %doc README TODO docs/CHANGES_0_9_1 -%{_javadir}/%{name}.jar +%{_jnidir}/%{name}.jar %{_libdir}/%{name} %files javadoc -%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} %files demo %{_bindir}/%{name}-*.sh @@ -220,6 +217,12 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Nov 25 2019 Hans de Goede - 0.9.1-45 +- Drop unnecessary BuildRequires: jruby +- Drop version prefix from javadocs installation the ghosted symlink + blocking us from doing this has last shipped in Fedora 16 +- Update to match latest java packaging guidelines + * Fri Jul 26 2019 Fedora Release Engineering - 0.9.1-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d99103a63ef9762683828065ca5cf0d9885d043e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 26 Nov 2019 10:06:00 +0100 Subject: [PATCH 07/29] Add missing BuildRequires: rubygems --- sdljava.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index ab4e2f8..00d0bd6 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -36,6 +36,7 @@ BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: %{_bindir}/ruby +BuildRequires: rubygems Requires: java Requires: javapackages-filesystem @@ -218,7 +219,7 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog * Mon Nov 25 2019 Hans de Goede - 0.9.1-45 -- Drop unnecessary BuildRequires: jruby +- Replace unnecessary BuildRequires: jruby with BuildRequires: rubygems - Drop version prefix from javadocs installation the ghosted symlink blocking us from doing this has last shipped in Fedora 16 - Update to match latest java packaging guidelines From 3f0a3ea07bf9a57f3f335fe04762c4b9361216a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:08:10 +0000 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 00d0bd6..2a3bd20 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.9.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 25 2019 Hans de Goede - 0.9.1-45 - Replace unnecessary BuildRequires: jruby with BuildRequires: rubygems - Drop version prefix from javadocs installation the ghosted symlink From 5bef068930ce82aa5a0e60bff284dd25857a1cd7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 6 Mar 2020 16:42:10 +0100 Subject: [PATCH 09/29] Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) Adjust -demo font paths for F32+ font path changes (rhbz#1806272) --- sdljava.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 2a3bd20..ecfa9eb 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -63,10 +63,7 @@ Javadoc for %{name}. Summary: Some examples for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: /usr/share/fonts/dejavu/DejaVuSans.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf +Requires: font(dejavusans) Requires: javapackages-tools %description demo @@ -194,13 +191,13 @@ popd #test data cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s ../../fonts/dejavu/DejaVuSans.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf @@ -218,6 +215,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Mar 6 2020 Hans de Goede - 0.9.1-47 +- Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) +- Adjust -demo font paths for F32+ font path changes (rhbz#1806272) + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a5f2e978af62629b8758566c40c062d6713a24a4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 10 Mar 2020 10:28:53 +0100 Subject: [PATCH 10/29] Use fc-match to generate dejavu font file symlinks in -demo in case the file-paths or names change again in the future --- sdljava.rpmlintrc | 2 ++ sdljava.spec | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sdljava.rpmlintrc b/sdljava.rpmlintrc index 02003cc..333107f 100644 --- a/sdljava.rpmlintrc +++ b/sdljava.rpmlintrc @@ -1,5 +1,7 @@ # We ship a cleaned tarbal with nonfree fonts removed addFilter("W: invalid-url Source0: sdljava-0.9.1.tar.gz") +# Silence warnings about the nonfree font replacement symlinks +addFilter("W: dangling-symlink .*") # The demos do not have docs / manpages, nor do they need these addFilter("W: no-manual-page-for-binary .*") addFilter("W: no-documentation") diff --git a/sdljava.spec b/sdljava.spec index ecfa9eb..73d383a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -37,6 +37,8 @@ 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 Requires: java Requires: javapackages-filesystem @@ -191,13 +193,13 @@ popd #test data cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \ +ln -s $(fc-match -f "%{file}" "sans") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \ +ln -s $(fc-match -f "%{file}" "sans:bold") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \ +ln -s $(fc-match -f "%{file}" "sans:italic") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ +ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf @@ -215,6 +217,10 @@ ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Mar 9 2020 Hans de Goede - 0.9.1-48 +- Use fc-match to generate dejavu font file symlinks in -demo in case the + file-paths or names change again in the future + * Fri Mar 6 2020 Hans de Goede - 0.9.1-47 - Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) - Adjust -demo font paths for F32+ font path changes (rhbz#1806272) From 0263c91ab9db442f89df0a7d4e0356b5375864b9 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 06:22:00 +0200 Subject: [PATCH 11/29] Rebuilt for JDK-11 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 73d383a..c1f3f82 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 48%{?dist} +Release: 49%{?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 +* Sat Jul 11 2020 Jiri Vanek - 0.9.1-49 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Mar 9 2020 Hans de Goede - 0.9.1-48 - Use fc-match to generate dejavu font file symlinks in -demo in case the file-paths or names change again in the future From 3c5b02be98e8d71fb518d5d2fa603fefb2218b34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:28:16 +0000 Subject: [PATCH 12/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 c1f3f82..68f1881 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 49%{?dist} +Release: 50%{?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 +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.1-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 0.9.1-49 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 94243a36a95a1fd75426c80b20dd808fe2f80d6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:08:51 +0000 Subject: [PATCH 13/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 68f1881..e0a88dd 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 50%{?dist} +Release: 51%{?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 +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.1-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7643bad05f7c58bb8fe9086869c98e3934fa12b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:16:54 +0000 Subject: [PATCH 14/29] - 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 15/29] 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 16/29] - 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 17/29] 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 18/29] 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 19/29] 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 20/29] 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 21/29] 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 22/29] 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 23/29] 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 24/29] 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 25/29] 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 26/29] 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 27/29] 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 28/29] 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 29/29] 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