From ca455c032d56efe652a18808ba6155c62576ca8b Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 From 92e362b19e91dfe94b3a488ebd4e46876aca092b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:46:21 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 9861f46..c07eb31 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 39%{?dist} +Release: 40%{?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 +* Sat Jan 17 2026 Fedora Release Engineering - 44-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 44-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c405316982f354d0211cbef89faef67d87c61282 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sun, 15 Mar 2026 19:31:28 -0400 Subject: [PATCH 07/10] rebuild for lua 5.5 --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index c07eb31..1b02392 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 40%{?dist} +Release: 41%{?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 Mar 15 2026 Tom Callaway - 44-41 +- rebuild for lua 5.5 + * Sat Jan 17 2026 Fedora Release Engineering - 44-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From a49e0bc5798c849a96aba4856bea2d0c92399c73 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 16 Apr 2026 22:34:50 -0400 Subject: [PATCH 08/10] rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 1b02392..c12cf91 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 41%{?dist} +Release: 42%{?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 +* Thu Apr 16 2026 Tom Callaway - 44-42 +- rebuild + * Sun Mar 15 2026 Tom Callaway - 44-41 - rebuild for lua 5.5 From 76d7969e73426a7c3136bbc6bcdee6e31a805869 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 14 Jul 2026 23:05:22 +0200 Subject: [PATCH 09/10] Fix SPDX license tag: 'LicenseRef-Callaway-CC-BY-SA' -> 'CC-BY-SA-3.0' The automated SPDX conversion (commit by msuchy, 44-37) left behind a 'LicenseRef-Callaway-CC-BY-SA' placeholder because the CC-BY-SA version could not be determined without inspecting the source tarball. License analysis ================ Files examined in 'Scorched3D-44-src.tar.gz': 1. 'scorched/COPYING' -- full text of the GNU General Public License version 2. Source files reference "or later", confirming 'GPL-2.0-or-later'. 2. 'scorched/data/globalmods/apoc/license.txt' -- full legal text of the Creative Commons Attribution-ShareAlike license. The first line reads: "Creative Commons Attribution-ShareAlike 3.0 License" The body matches the CC-BY-SA-3.0 legal code (references "Creative Commons Compatible License", section 4(b) re-licensing provisions specific to version 3.0). This is the authoritative license for the bundled Apocalypse mod content. 3. 'scorched/data/globalmods/apoc/readme.txt' -- mod readme, "Legal Stuff" section also states "Creative Commons Attribution-ShareAlike 3.0", consistent with 'license.txt'. 4. 'scorched/data/globalmods/apoc/readme-nexus.txt' -- historical readme for Nexus6's map pack references "Attribution-ShareAlike 2.0" in its human-readable summary, but directs readers to the LICENSE file for the full legal text. The actual license file ('license.txt') is unambiguously version 3.0. The Apocalypse mod absorbed Nexus6's maps under CC-BY-SA-3.0 (which is a valid re-licensing path under CC-BY-SA-2.0 share-alike provisions). 5. 'scorched/data/globalmods/apoc/data/landscapes.xml' -- copyright notices for maps by Bobirov, Nexus6, and ShoCkwaVe all state "distributed under the Creative Commons Attribution-ShareAlike license" without specifying a version; the mod-level 'license.txt' governs. SPDX mapping ============= Old: 'GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA' New: 'GPL-2.0-or-later AND CC-BY-SA-3.0' Also removed the "Automatically converted" comment and bumped Release to 43. Co-Authored-By: Claude AI --- scorched3d.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index c12cf91..83d5a03 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,10 +2,9 @@ Name: scorched3d Version: 44 -Release: 42%{?dist} +Release: 43%{?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 +License: GPL-2.0-or-later AND CC-BY-SA-3.0 URL: http://www.scorched3d.co.uk/ Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop @@ -152,6 +151,10 @@ EOF %changelog +* Tue Jul 14 2026 Michal Schorm - 44-43 +- Fix SPDX license tag: replace 'LicenseRef-Callaway-CC-BY-SA' with + 'CC-BY-SA-3.0' based on upstream license text + * Thu Apr 16 2026 Tom Callaway - 44-42 - rebuild From 46ea3d4d48b4f2809dca086409903344c2fbdf00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:16:49 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 83d5a03..76b0e05 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPL-2.0-or-later AND CC-BY-SA-3.0 URL: http://www.scorched3d.co.uk/ @@ -151,6 +151,9 @@ EOF %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 44-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jul 14 2026 Michal Schorm - 44-43 - Fix SPDX license tag: replace 'LicenseRef-Callaway-CC-BY-SA' with 'CC-BY-SA-3.0' based on upstream license text