diff --git a/.gitignore b/.gitignore index 268bc9f..e1e5f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,13 +14,3 @@ /endless-sky-0.10.5.tar.gz /endless-sky-0.10.6.tar.gz /endless-sky-0.10.7.tar.gz -/endless-sky-0.10.8.tar.gz -/endless-sky-0.10.9.tar.gz -/endless-sky-0.10.10.tar.gz -/endless-sky-0.10.11.tar.gz -/endless-sky-0.10.12.tar.gz -/endless-sky-0.10.13.tar.gz -/endless-sky-0.10.13.1.tar.gz -/endless-sky-0.10.14.tar.gz -/endless-sky-0.10.15.tar.gz -/endless-sky-0.10.16.tar.gz diff --git a/10952.patch b/10952.patch deleted file mode 100644 index 1b2c318..0000000 --- a/10952.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4b0aa4e3e79476361dc8bb58365b90af2b9d1523 Mon Sep 17 00:00:00 2001 -From: Daniel <101683475+Koranir@users.noreply.github.com> -Date: Mon, 27 Jan 2025 14:07:30 +1100 -Subject: [PATCH] add missing imports - ---- - source/BoardingPanel.cpp | 1 + - source/PlayerInfo.cpp | 1 + - source/ShipInfoPanel.cpp | 1 + - source/ShipNameDialog.cpp | 2 ++ - 4 files changed, 5 insertions(+) - -diff --git a/source/BoardingPanel.cpp b/source/BoardingPanel.cpp -index 79448fb81a7c..460e70eea501 100644 ---- a/source/BoardingPanel.cpp -+++ b/source/BoardingPanel.cpp -@@ -39,6 +39,7 @@ this program. If not, see . - #include "UI.h" - - #include -+#include - #include - - using namespace std; -diff --git a/source/PlayerInfo.cpp b/source/PlayerInfo.cpp -index a3ecbf201d3a..9dc6c602fa58 100644 ---- a/source/PlayerInfo.cpp -+++ b/source/PlayerInfo.cpp -@@ -49,6 +49,7 @@ this program. If not, see . - #include - #include - #include -+#include - #include - #include - #include -diff --git a/source/ShipInfoPanel.cpp b/source/ShipInfoPanel.cpp -index 224e0bcf948f..b0e435a43ae9 100644 ---- a/source/ShipInfoPanel.cpp -+++ b/source/ShipInfoPanel.cpp -@@ -44,6 +44,7 @@ this program. If not, see . - #include "UI.h" - - #include -+#include - #include - - using namespace std; -diff --git a/source/ShipNameDialog.cpp b/source/ShipNameDialog.cpp -index 629e68012190..67cbb07e9b43 100644 ---- a/source/ShipNameDialog.cpp -+++ b/source/ShipNameDialog.cpp -@@ -23,6 +23,8 @@ this program. If not, see . - #include "image/SpriteSet.h" - #include "shader/SpriteShader.h" - -+#include -+ - using namespace std; - - diff --git a/endless-sky-0.10.0-remove-games-path.patch b/endless-sky-0.10.0-remove-games-path.patch index 56fed28..b553f01 100644 --- a/endless-sky-0.10.0-remove-games-path.patch +++ b/endless-sky-0.10.0-remove-games-path.patch @@ -1,32 +1,30 @@ ---- a/CMakeLists.txt~ 2025-05-31 14:24:07.000000000 -0500 -+++ b/CMakeLists.txt 2025-06-02 13:43:10.496539999 -0500 -@@ -318,12 +318,12 @@ +--- CMakeLists.txt~ 2023-02-19 15:37:56.000000000 -0600 ++++ CMakeLists.txt 2023-02-21 15:25:06.378269708 -0600 +@@ -230,11 +230,11 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/endless-sky.6.gz DESTINATION share/man/man6) # Install the resource files. - install(DIRECTORY data DESTINATION share/games/endless-sky) - install(DIRECTORY images DESTINATION share/games/endless-sky) -- install(DIRECTORY shaders DESTINATION share/games/endless-sky) - install(DIRECTORY sounds DESTINATION share/games/endless-sky) - install(FILES credits.txt DESTINATION share/games/endless-sky) - install(FILES keys.txt DESTINATION share/games/endless-sky) + install(DIRECTORY data DESTINATION share/endless-sky) + install(DIRECTORY images DESTINATION share/endless-sky) -+ install(DIRECTORY shaders DESTINATION share/endless-sky) + install(DIRECTORY sounds DESTINATION share/endless-sky) + install(FILES credits.txt DESTINATION share/endless-sky) + install(FILES keys.txt DESTINATION share/endless-sky) install(FILES copyright DESTINATION share/doc/endless-sky) install(FILES changelog DESTINATION share/doc/endless-sky) install(FILES license.txt DESTINATION share/doc/endless-sky) ---- a/source/Files.cpp~ 2025-05-31 14:24:07.000000000 -0500 -+++ b/source/Files.cpp 2025-06-02 14:50:55.468669156 -0500 -@@ -128,7 +128,7 @@ - // the end, so parent paths do not include it. - static const filesystem::path LOCAL_PATH = "/usr/local"; - static const filesystem::path STANDARD_PATH = "/usr"; -- static const filesystem::path RESOURCE_PATH = "share/games/endless-sky/"; -+ static const filesystem::path RESOURCE_PATH = "share/endless-sky/"; - - if(IsParent(LOCAL_PATH, resources)) - resources = LOCAL_PATH / RESOURCE_PATH; +--- source/Files.cpp~ 2023-02-19 15:37:56.000000000 -0600 ++++ source/Files.cpp 2023-02-21 16:08:00.520703810 -0600 +@@ -118,7 +118,7 @@ + // the executable, but are under the same prefix (/usr or /usr/local). + static const string LOCAL_PATH = "/usr/local/"; + static const string STANDARD_PATH = "/usr/"; +- static const string RESOURCE_PATH = "share/games/endless-sky/"; ++ static const string RESOURCE_PATH = "share/endless-sky/"; + if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH)) + resources = LOCAL_PATH + RESOURCE_PATH; + else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH)) diff --git a/endless-sky.spec b/endless-sky.spec index 0653c5b..520a617 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,10 +1,9 @@ Name: endless-sky -Version: 0.10.16 +Version: 0.10.7 Release: 1%{?dist} Summary: Space exploration, trading, and combat game -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +License: GPLv3 URL: https://%{name}.github.io Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: endless-sky-wrapper @@ -28,14 +27,6 @@ BuildRequires: desktop-file-utils BuildRequires: libmad-devel BuildRequires: libuuid-devel BuildRequires: mesa-libGL-devel -BuildRequires: catch-devel -BuildRequires: libasan -BuildRequires: libubsan -BuildRequires: minizip-ng-compat-devel -BuildRequires: cmake(flac) -BuildRequires: flac -BuildRequires: libavif-devel -BuildRequires: cmake(ogg) %description Explore other star systems. Earn money by trading, carrying passengers, or @@ -58,7 +49,7 @@ Images, sound, and game data for %{name}. %prep -%autosetup -p1 +%autosetup -p0 %build @@ -101,48 +92,6 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog -* Mon Oct 27 2025 Gwyn Ciesla - 0.10.16-1 -- 0.10.16 - -* Mon Sep 29 2025 Gwyn Ciesla - 0.10.15-1 -- 0.10.15 - -* Wed Jul 23 2025 Fedora Release Engineering - 0.10.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jul 03 2025 Gwyn Ciesla - 0.10.14-1 -- 0.10.14 - -* Thu Jun 05 2025 Gwyn Ciesla - 0.10.13.1-1 -- 0.10.13.1 - -* Mon Jun 02 2025 Gwyn Ciesla - 0.10.13-1 -- 0.10.13 - -* Sun Feb 23 2025 Gwyn Ciesla - 0.10.12-1 -- 0.10.12 - -* Mon Jan 27 2025 Gwyn Ciesla - 0.10.11-1 -- 0.10.11 - -* Thu Jan 16 2025 Fedora Release Engineering - 0.10.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Oct 28 2024 Gwyn Ciesla - 0.10.10-1 -- 0.10.10 - -* Mon Sep 30 2024 Gwyn Ciesla - 0.10.9-1 -- 0.10.9 - -* Mon Jul 29 2024 Miroslav Suchý - 0.10.8-3 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0.10.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 24 2024 Gwyn Ciesla - 0.10.8-1 -- 0.10.8 - * Tue May 28 2024 Gwyn Ciesla - 0.10.7-1 - 0.10.7 diff --git a/sources b/sources index b186ba4..f14cafc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.16.tar.gz) = 8dd8ee8bdb71ceda23024ac07502adab4f246ed3723fdc49d152de1796ba799c8584d31892f357034fa9c7d93c2880278f05cde9c0bd7e7e789eabb0513ba4ca +SHA512 (endless-sky-0.10.7.tar.gz) = e85d648b9903f5c44a2748f5be410e510987618841744ceffd23ae826dc56cf411c5e7f07979597a050d703443c1540ef63ce709608a2078789233b660be4ea2