From 17eb269611064f6e1ecf0944e5c8c48090494872 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:49:02 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 660b6d4..5e7cd10 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -149,6 +149,9 @@ EOF %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 44-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Aug 04 2022 Scott Talbert - 44-31 - Rebuild with wxWidgets 3.2 From 7bea785fe029dfa288694ac0d6565bf52f0a8d62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:12:26 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 5e7cd10..73622d2 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -149,6 +149,9 @@ EOF %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 44-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 44-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5f193456ae540e732db37c0255a5c3f9a857c767 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 19 Dec 2023 12:29:44 +0100 Subject: [PATCH 3/9] Fix C type error in configure script (#2255225) Related to: --- scorched3d-configure-c99.patch | 12 ++++++++++++ scorched3d.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 scorched3d-configure-c99.patch diff --git a/scorched3d-configure-c99.patch b/scorched3d-configure-c99.patch new file mode 100644 index 0000000..982074c --- /dev/null +++ b/scorched3d-configure-c99.patch @@ -0,0 +1,12 @@ +diff -ur scorched3d-44.orig/scorched/configure-al.m4 scorched3d-44/scorched/configure-al.m4 +--- scorched3d-44.orig/scorched/configure-al.m4 2014-08-01 18:47:31.000000000 +0200 ++++ scorched3d-44/scorched/configure-al.m4 2023-12-19 12:05:21.918456484 +0100 +@@ -91,7 +91,7 @@ + + int main(int argc, char *argv[]) + { +- alutInit(argc, argv); ++ alutInit(&argc, argv); + return 0; + } + #undef main diff --git a/scorched3d.spec b/scorched3d.spec index 73622d2..0405516 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -18,6 +18,7 @@ Patch5: %{name}-returntype.patch Patch6: %{name}-wx3.0.patch Patch7: %{name}-lua54.patch Patch8: %{name}-fix-hang-on-fast-machines.patch +Patch9: scorched3d-configure-c99.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: wxGTK-devel SDL_net-devel libGLU-devel @@ -56,6 +57,7 @@ pushd scorched %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p2 touch NEWS AUTHORS ChangeLog autoreconf -ivf install -m 755 %{SOURCE2} . @@ -149,6 +151,9 @@ EOF %changelog +* Tue Dec 19 2023 Florian Weimer - 44-34 +- Fix C type error in configure script (#2255225) + * Sat Jul 22 2023 Fedora Release Engineering - 44-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 85cb62e30c01fef611fdfb1e4fdd66200452ba61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:16:41 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 0405516..0ba820b 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -151,6 +151,9 @@ EOF %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 44-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Florian Weimer - 44-34 - Fix C type error in configure script (#2255225) From ca455c032d56efe652a18808ba6155c62576ca8b Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 5/9] Eliminate use of obsolete %patchN syntax (#2283636) --- scorched3d.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index 0ba820b..92d8696 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -49,15 +49,15 @@ conditions and terrains to be dealt with. %prep %setup -q -c pushd scorched -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p0 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p2 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p0 +%patch -P6 -p1 +%patch -P7 -p1 +%patch -P8 -p1 +%patch -P9 -p2 touch NEWS AUTHORS ChangeLog autoreconf -ivf install -m 755 %{SOURCE2} . From 85fe3ec60059534d60f1aa9ddf9834d8df3fe949 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 04:59:34 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 92d8696..fb5f6f0 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -151,6 +151,9 @@ EOF %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 44-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 44-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97f949db14d8d99021f73d79397352abaa808df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:49:49 +0200 Subject: [PATCH 7/9] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- scorched3d.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index fb5f6f0..3566299 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,9 +2,10 @@ Name: scorched3d Version: 44 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth -License: GPLv2+ and CC-BY-SA +# Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA URL: http://www.scorched3d.co.uk/ Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop @@ -151,6 +152,9 @@ EOF %changelog +* Wed Sep 04 2024 Miroslav Suchý - 44-37 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 44-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0dc42e4c9b5127831f63adabab6fdd3bcd04b27e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:10:52 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 3566299..4d357d9 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. License: GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA @@ -152,6 +152,9 @@ EOF %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 44-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 44-37 - convert license to SPDX From 410a0987e05f7d16117c181ec6f08436f6b8e44b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:01:43 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 4d357d9..9861f46 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. License: GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA @@ -152,6 +152,9 @@ EOF %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 44-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 44-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild