From 29a23c36d1f1e9356540bfa254a9c09a7351566a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:18:12 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index c007cd7..3d463bb 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -154,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 44-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 44-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From bd13f9a790ed3dd436cdadecbc70cf3db9d4b643 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:14:46 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 3d463bb..11f9972 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -154,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 44-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 44-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 64e3fedaccad2601859ccf1954c253841cf682e2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:14:45 +0100 Subject: [PATCH 03/32] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- scorched3d.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index 11f9972..6819afe 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -131,19 +131,6 @@ SentUpstream: 2014-09-25 EOF -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files %doc scorched/COPYING scorched/apoc %{_bindir}/%{name}* @@ -154,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jan 18 2018 Igor Gnatenko - 44-14 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 44-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f2f067477528fad18882c1ab3cbac390a41045f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:19:23 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 6819afe..d621f95 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -141,6 +141,9 @@ EOF %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 44-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 44-14 - Remove obsolete scriptlets From d76cbeaa22bebeffdde99f76a96ba1715ae6a37b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 05:51:12 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 d621f95..8fb55b3 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -141,6 +141,9 @@ EOF %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 44-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 44-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From fdbc6c2869b11746b24c235c113dea494d92b3f1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 06/32] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- scorched3d.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/scorched3d.spec b/scorched3d.spec index 8fb55b3..b451c52 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -14,6 +14,7 @@ Patch2: %{name}-help.patch Patch3: %{name}-freetype-buildfix.patch Patch4: %{name}-sys-lua.patch Patch5: %{name}-returntype.patch +BuildRequires: gcc-c++ BuildRequires: wxGTK-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 From aee76f092c2d549b477a0a4df0b9608e389d8266 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:08:06 +0200 Subject: [PATCH 07/32] - Rebuilt for glew 2.1.0 --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index b451c52..dfb836e 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -142,6 +142,9 @@ EOF %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 44-17 +- Rebuilt for glew 2.1.0 + * Sat Jul 14 2018 Fedora Release Engineering - 44-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b499463fad73def984ed3ccbb2d3062d249a9aa6 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 30 Oct 2018 20:47:44 -0400 Subject: [PATCH 08/32] Rebuild with wxWidgets 3.0 --- scorched3d-wx3.0.patch | 170 +++++++++++++++++++++++++++++++++++++++++ scorched3d.spec | 9 ++- 2 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 scorched3d-wx3.0.patch diff --git a/scorched3d-wx3.0.patch b/scorched3d-wx3.0.patch new file mode 100644 index 0000000..7ba7a13 --- /dev/null +++ b/scorched3d-wx3.0.patch @@ -0,0 +1,170 @@ +From: Markus Koschany +Date: Fri, 15 Jul 2016 18:01:36 +0200 +Subject: wx3.0 compat + +Make Scorched3D compatible with wxWidgets 3.0 + +Thanks to Olly Betts for the patch. +--- + src/launcher/wxdialogs/Display.cpp | 10 +++++----- + src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++----- + src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++------- + 3 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/launcher/wxdialogs/Display.cpp b/src/launcher/wxdialogs/Display.cpp +index e0a423a..22169e0 100644 +--- a/src/launcher/wxdialogs/Display.cpp ++++ b/src/launcher/wxdialogs/Display.cpp +@@ -26,7 +26,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer) + // Display settings + wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display")); + wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL); +- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5); ++ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5); + wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :")); + IDC_DISPLAY_CTRL = + new wxComboBox(parent, -1, +@@ -88,7 +88,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer) + // Sound settings + wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound")); + wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL); +- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2); ++ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0); + wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :")); + wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :")); + wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :")); +@@ -137,7 +137,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer) + wxT("Game Detail Options")); + wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL); + +- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2); ++ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0); + IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1)); + IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1)); + IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1)); +@@ -256,7 +256,7 @@ static void createSpeedControls(wxWindow *parent, wxSizer *sizer) + wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, + wxT("Graphics Detail")); + wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL); +- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10); ++ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10); + + IDC_NOWATERREF_CTRL = + new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement")); +@@ -471,7 +471,7 @@ static void createKeysControls(wxWindow *parent, wxSizer *topsizer) + { + wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, + wxDefaultPosition, wxSize(480, 250)); +- wxSizer *sizer = new wxFlexGridSizer(5, 1); ++ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0); + + keyboardKeyList.clear(); + if (!Keyboard::instance()->loadKeyFile()) +diff --git a/src/launcher/wxdialogs/DisplayDialog.cpp b/src/launcher/wxdialogs/DisplayDialog.cpp +index c34c9dc..0cdc620 100644 +--- a/src/launcher/wxdialogs/DisplayDialog.cpp ++++ b/src/launcher/wxdialogs/DisplayDialog.cpp +@@ -449,15 +449,15 @@ void DisplayFrame::refreshScreen() + IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness()); + IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8)); + IDC_VOLUME_CTRL->SetRange(0, 128); +- IDC_VOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_VOLUME_CTRL->SetTickFreq(4); + IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume()); + IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8)); + IDC_MUSICVOLUME_CTRL->SetRange(0, 128); +- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_MUSICVOLUME_CTRL->SetTickFreq(4); + IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume()); + IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8)); + IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128); +- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4); + IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume()); + IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8)); + IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8)); +@@ -736,7 +736,7 @@ void DisplayFrame::onExportMod(wxCommandEvent &event) + #if wxCHECK_VERSION(2, 8, 0) + wxFD_SAVE); + #else +- wxSAVE); ++ wxFD_SAVE); + #endif + if (file.empty()) return; + ModFiles files; +@@ -764,7 +764,7 @@ void DisplayFrame::onImportMod(wxCommandEvent &event) + #if wxCHECK_VERSION(2, 8, 0) + wxFD_OPEN | wxFD_FILE_MUST_EXIST); + #else +- wxOPEN | wxFILE_MUST_EXIST); ++ wxFD_OPEN | wxFD_FILE_MUST_EXIST); + #endif + if (file.empty()) return; + ModFiles files; +diff --git a/src/launcher/wxdialogs/SettingsDialog.cpp b/src/launcher/wxdialogs/SettingsDialog.cpp +index b312085..03ba629 100644 +--- a/src/launcher/wxdialogs/SettingsDialog.cpp ++++ b/src/launcher/wxdialogs/SettingsDialog.cpp +@@ -105,7 +105,7 @@ void SettingsFrame::createMainPanel(bool server) + mainPanel_ = new wxPanel(book_, -1); + book_->AddPage(mainPanel_, wxT("Main")); + wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -166,7 +166,7 @@ void SettingsFrame::createMoneyPanel() + { + moneyPanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -215,7 +215,7 @@ void SettingsFrame::createScorePanel() + { + scorePanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -249,7 +249,7 @@ void SettingsFrame::createWeaponsPanel() + { + weaponsPanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -286,7 +286,7 @@ void SettingsFrame::createEnvPanel() + { + envPanel_ = new wxPanel(book_, -1); + wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -337,7 +337,7 @@ void SettingsFrame::createLandPanel() + wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, + wxDefaultPosition, wxSize(225, 200)); + +- wxSizer *sizer = new wxFlexGridSizer(3, 3); ++ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0); + int i = 0; + std::list &defns = + landscapeDefinitions.getAllLandscapes(); +@@ -438,7 +438,7 @@ void SettingsFrame::createPlayersPanel() + wxT("Players are persistent for game")); + playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10); + +- wxSizer *sizer = new wxGridSizer(3, 3); ++ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0); + playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + for (int i=0; i<24; i++) diff --git a/scorched3d.spec b/scorched3d.spec index dfb836e..8813a15 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ and CC-BY-SA @@ -14,8 +14,9 @@ Patch2: %{name}-help.patch Patch3: %{name}-freetype-buildfix.patch Patch4: %{name}-sys-lua.patch Patch5: %{name}-returntype.patch +Patch6: %{name}-wx3.0.patch BuildRequires: gcc-c++ -BuildRequires: wxGTK-devel SDL_net-devel libGLU-devel +BuildRequires: wxGTK3-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 BuildRequires: lua-devel libtool autoconf automake @@ -50,6 +51,7 @@ pushd scorched %endif %patch4 -p1 %patch5 -p0 +%patch6 -p1 touch NEWS AUTHORS ChangeLog autoreconf -ivf install -m 755 %{SOURCE2} . @@ -142,6 +144,9 @@ EOF %changelog +* Tue Oct 30 2018 Scott Talbert - 44-18 +- Rebuild with wxWidgets 3.0 + * Thu Aug 23 2018 Nicolas Chauvet - 44-17 - Rebuilt for glew 2.1.0 From ca0395ea6a2d6946b228681ee94e78c893303a86 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:25 +0100 Subject: [PATCH 09/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- scorched3d.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 8813a15..8ae4336 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,6 @@ Name: scorched3d Version: 44 Release: 18%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth -Group: Amusements/Games License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz From d53db1d6a4e908263d5314526c66f115a5dcf930 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 14:58:30 +0000 Subject: [PATCH 10/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 8ae4336..bb73156 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -143,6 +143,9 @@ EOF %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 44-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Oct 30 2018 Scott Talbert - 44-18 - Rebuild with wxWidgets 3.0 From 02be56d2538dcaaff7129101a2cba8a6d8920264 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 22:55:22 +0000 Subject: [PATCH 11/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 bb73156..74efe89 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -143,6 +143,9 @@ EOF %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 44-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 44-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From bfff9b4abb5515cbda29f0629b8b8807a8027af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:02:49 +0000 Subject: [PATCH 12/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 74efe89..729767b 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -143,6 +143,9 @@ EOF %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 44-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 44-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0aef523c17231916df3bab47af64d11510bbda39 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 13 May 2020 06:57:07 -0500 Subject: [PATCH 13/32] Automate finding font files at build time --- scorched3d.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index 729767b..cd4240b 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -20,8 +20,13 @@ BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 BuildRequires: lua-devel libtool autoconf automake BuildRequires: ImageMagick desktop-file-utils + +# Handle font moves more automatically +%global fonts font(dejavusans) font(dejavusansmono) +BuildRequires: fontconfig %{fonts} +Requires: %{fonts} + Requires: hicolor-icon-theme opengl-games-utils -Requires: dejavu-sans-fonts dejavu-sans-mono-fonts # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -81,11 +86,11 @@ pushd scorched %make_install ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper -ln -f -s ../../../fonts/dejavu/DejaVuSans.ttf \ +ln -f -s $(fc-match -f "%{file}" "sans") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusans.ttf -ln -f -s ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf \ +ln -f -s $(fc-match -f "%{file}" "sans:condensed:bold") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusconbd.ttf -ln -f -s ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf \ +ln -f -s $(fc-match -f "%{file}" "monospace:bold") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/dejavusmobd.ttf # below is the desktop file and icon stuff. @@ -143,6 +148,9 @@ EOF %changelog +* Wed May 13 2020 Bruno Wolff III - 44-22 +- Automate finding font paths during build + * Thu Jan 30 2020 Fedora Release Engineering - 44-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c6fc01943e3e42cae7421e519c44de486171487c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:24:05 +0000 Subject: [PATCH 14/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 cd4240b..f353eab 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -148,6 +148,9 @@ EOF %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 44-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 13 2020 Bruno Wolff III - 44-22 - Automate finding font paths during build From 426e29a63721d7ab0c9b13a043aa6cbd7e1e4a59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 08:58:08 +0000 Subject: [PATCH 15/32] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scorched3d.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index f353eab..25abac9 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d Version: 44 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -148,6 +148,10 @@ EOF %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 44-24 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 44-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fd4bc08b6b1b163ad001b29abd8019e84fbf63e0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 13 Aug 2020 22:19:10 +0200 Subject: [PATCH 16/32] Fix FTBFS (rhbz#1865470) Fix hang of non-networked games on fast machines --- scorched3d-fix-hang-on-fast-machines.patch | 53 ++++++++++++++++++++++ scorched3d-lua54.patch | 36 +++++++++++++++ scorched3d.spec | 24 ++++++---- 3 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 scorched3d-fix-hang-on-fast-machines.patch create mode 100644 scorched3d-lua54.patch diff --git a/scorched3d-fix-hang-on-fast-machines.patch b/scorched3d-fix-hang-on-fast-machines.patch new file mode 100644 index 0000000..4773081 --- /dev/null +++ b/scorched3d-fix-hang-on-fast-machines.patch @@ -0,0 +1,53 @@ +diff -up scorched/src/common/coms/ComsLoadLevelMessage.cpp~ scorched/src/common/coms/ComsLoadLevelMessage.cpp +--- scorched/src/common/coms/ComsLoadLevelMessage.cpp~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/coms/ComsLoadLevelMessage.cpp 2020-08-13 21:33:59.895250469 +0200 +@@ -108,6 +108,49 @@ bool ComsLoadLevelMessage::loadState(Sco + + bool ComsLoadLevelMessage::loadTanks(ScorchedContext &context) + { ++ /* ++ * There is a timing bug which shows on really fast machines ++ * where the client starts talking to the server before the ++ * server initial setup is done. ++ * In sofar as I have managed to debug this, the following ++ * happens on slower machines, aka the GOOD case: ++ * ++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Fred" ++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Ted" ++ * Server TankAddSimAction::invokeAction() new Tank "Player 1" ++ * Server TankAddSimAction::invokeAction() new Tank "Spectator" ++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Fred" ++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Ted" ++ * Client TankAddSimAction::invokeAction() new Tank "Player 1" ++ * Client TankAddSimAction::invokeAction() new Tank "Spectator" ++ * ++ * Note the server internally creates all tanks before the ++ * client does and thus before the client starts sending ++ * messages related to these tanks to the server. ++ * ++ * On a fast enough system (i7-10610U) the following order ++ * has been observed instead: ++ * ++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Fred" ++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Ted" ++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Fred" ++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Ted" ++ * Client TankAddSimAction::invokeAction() new Tank "Player 1" ++ * Client TankAddSimAction::invokeAction() new Tank "Spectator" ++ * Server TankAddSimAction::invokeAction() new Tank "Player 1" ++ * Server TankAddSimAction::invokeAction() new Tank "Spectator" ++ * ++ * Note the server creates the "Player 1" and "Spectator" ++ * tanks after the client, this causes the server to ignore ++ * some initial messages from the client related to these ++ * tanks, after which things get stuck, breaking non-networked ++ * games on fast machines. ++ * ++ * The sleep below is an ugly but effective workaround for this ++ * issue. ++ */ ++ SDL_Delay(100); ++ + NetBufferReader reader(tanksBuffer_); + + // Add any new tanks diff --git a/scorched3d-lua54.patch b/scorched3d-lua54.patch new file mode 100644 index 0000000..28a4d56 --- /dev/null +++ b/scorched3d-lua54.patch @@ -0,0 +1,36 @@ +diff -up scorched3d-44/scorched/src/common/lua/LUAS3DLib.cpp~ scorched3d-44/scorched/src/common/lua/LUAS3DLib.cpp +--- a/src/common/lua/LUAS3DLib.cpp~ 2020-08-11 15:07:12.000000000 +0200 ++++ b/src/common/lua/LUAS3DLib.cpp 2020-08-11 15:22:07.159970299 +0200 +@@ -349,7 +349,14 @@ static const luaL_Reg s3dlib[] = { + }; + + LUALIB_API int luaopen_s3d (lua_State *L) { ++#if LUA_VERSION_NUM > 501 ++ lua_newtable(L); ++ luaL_setfuncs(L, s3dlib, 0); ++ lua_pushvalue(L, -1); ++ lua_setglobal(L, LUA_S3DLIBNAME); ++#else + luaL_register(L, LUA_S3DLIBNAME, s3dlib); ++#endif + return 1; + } + +diff -up scorched3d-44/scorched/src/common/lua/LUAS3DWeaponLib.cpp~ scorched3d-44/scorched/src/common/lua/LUAS3DWeaponLib.cpp +--- a/src/common/lua/LUAS3DWeaponLib.cpp~ 2020-08-11 15:32:25.000000000 +0200 ++++ b/src/common/lua/LUAS3DWeaponLib.cpp 2020-08-11 15:35:49.886946546 +0200 +@@ -156,7 +156,14 @@ static const luaL_Reg s3dweaponlib[] = { + }; + + LUALIB_API int luaopen_s3dweapon (lua_State *L) { ++#if LUA_VERSION_NUM > 501 ++ lua_newtable(L); ++ luaL_setfuncs(L, s3dweaponlib, 0); ++ lua_pushvalue(L, -1); ++ lua_setglobal(L, LUA_S3DWEAPONLIBNAME); ++#else + luaL_register(L, LUA_S3DWEAPONLIBNAME, s3dweaponlib); ++#endif + return 1; + } + diff --git a/scorched3d.spec b/scorched3d.spec index 25abac9..b871a49 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,8 @@ +%global fonts font(dejavusans) font(dejavusansmono) + Name: scorched3d Version: 44 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -14,19 +16,16 @@ Patch3: %{name}-freetype-buildfix.patch Patch4: %{name}-sys-lua.patch Patch5: %{name}-returntype.patch Patch6: %{name}-wx3.0.patch +Patch7: %{name}-lua54.patch +Patch8: %{name}-fix-hang-on-fast-machines.patch BuildRequires: gcc-c++ BuildRequires: wxGTK3-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 BuildRequires: lua-devel libtool autoconf automake BuildRequires: ImageMagick desktop-file-utils - -# Handle font moves more automatically -%global fonts font(dejavusans) font(dejavusansmono) -BuildRequires: fontconfig %{fonts} -Requires: %{fonts} - -Requires: hicolor-icon-theme opengl-games-utils +BuildRequires: fontconfig %{fonts} +Requires: hicolor-icon-theme opengl-games-utils %{fonts} # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -50,12 +49,12 @@ conditions and terrains to be dealt with. pushd scorched %patch1 -p1 %patch2 -p1 -%if 0%{?fedora} >= 21 %patch3 -p1 -%endif %patch4 -p1 %patch5 -p0 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 touch NEWS AUTHORS ChangeLog autoreconf -ivf install -m 755 %{SOURCE2} . @@ -138,6 +137,7 @@ SentUpstream: 2014-09-25 EOF + %files %doc scorched/COPYING scorched/apoc %{_bindir}/%{name}* @@ -148,6 +148,10 @@ EOF %changelog +* Tue Aug 11 2020 Hans de Goede - 44-25 +- Fix FTBFS (rhbz#1865470) +- Fix hang of non-networked games on fast machines + * Sat Aug 01 2020 Fedora Release Engineering - 44-24 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f36a8807af160c06eba281fe7e88bbeee616c8ad Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:14:53 +0000 Subject: [PATCH 17/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- scorched3d.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/scorched3d.spec b/scorched3d.spec index b871a49..14ea201 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -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 +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: wxGTK3-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel From 1068b68694a1f9647a69960c0dca3c1758c58eb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:05:06 +0000 Subject: [PATCH 18/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 14ea201..0bf969d 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 25%{?dist} +Release: 26%{?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 +* Wed Jan 27 2021 Fedora Release Engineering - 44-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 11 2020 Hans de Goede - 44-25 - Fix FTBFS (rhbz#1865470) - Fix hang of non-networked games on fast machines From d9fc5f82abb6db6647554f173ad36bcbffeeaaf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:12:17 +0000 Subject: [PATCH 19/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 0bf969d..2a85ba6 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 26%{?dist} +Release: 27%{?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 +* Fri Jul 23 2021 Fedora Release Engineering - 44-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 44-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a439762d90d0ac3ab31439a5f180ccf655470f2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:30:26 +0000 Subject: [PATCH 20/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 2a85ba6..82d00a5 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 27%{?dist} +Release: 28%{?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 22 2022 Fedora Release Engineering - 44-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 44-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 813e151b0cb52c356584e0438e8f9d3284d01096 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 21:08:26 -0700 Subject: [PATCH 21/32] Rebuild for glew 2.2 --- scorched3d.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scorched3d.spec b/scorched3d.spec index 82d00a5..1051cd0 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 28%{?dist} +Release: 29%{?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 +* Thu Feb 10 2022 Orion Poplawski - 44-29 +- Rebuild for glew 2.2 + * Sat Jan 22 2022 Fedora Release Engineering - 44-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 93abd7bf7cfd9723f9a48e328e2a8efb642592ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:11:12 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 1051cd0..89d641f 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 29%{?dist} +Release: 30%{?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 23 2022 Fedora Release Engineering - 44-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Feb 10 2022 Orion Poplawski - 44-29 - Rebuild for glew 2.2 From aba89d6d9743acbb5010ff08e2eda7645b01fc0b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:26:52 -0400 Subject: [PATCH 23/32] Rebuild with wxWidgets 3.2 --- scorched3d.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scorched3d.spec b/scorched3d.spec index 89d641f..660b6d4 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -2,7 +2,7 @@ Name: scorched3d Version: 44 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ @@ -20,7 +20,7 @@ Patch7: %{name}-lua54.patch Patch8: %{name}-fix-hang-on-fast-machines.patch BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: wxGTK3-devel SDL_net-devel libGLU-devel +BuildRequires: wxGTK-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 BuildRequires: lua-devel libtool autoconf automake @@ -149,6 +149,9 @@ EOF %changelog +* Thu Aug 04 2022 Scott Talbert - 44-31 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 44-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 17eb269611064f6e1ecf0944e5c8c48090494872 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:49:02 +0000 Subject: [PATCH 24/32] 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 25/32] 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 26/32] 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 27/32] 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 28/32] 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 29/32] 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 30/32] 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 31/32] 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 32/32] 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