diff --git a/scorched3d-configure-c99.patch b/scorched3d-configure-c99.patch deleted file mode 100644 index 982074c..0000000 --- a/scorched3d-configure-c99.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 9861f46..660b6d4 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,10 +2,9 @@ Name: scorched3d Version: 44 -Release: 39%{?dist} +Release: 31%{?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: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop @@ -19,7 +18,6 @@ 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 @@ -50,15 +48,14 @@ conditions and terrains to be dealt with. %prep %setup -q -c pushd scorched -%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 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p0 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 touch NEWS AUTHORS ChangeLog autoreconf -ivf install -m 755 %{SOURCE2} . @@ -152,30 +149,6 @@ 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 - -* 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 - -* 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) - -* 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 - * Thu Aug 04 2022 Scott Talbert - 44-31 - Rebuild with wxWidgets 3.2