diff --git a/.gitignore b/.gitignore index 268bc9f..1685a71 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,3 @@ /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/endless-sky-0.10.0-remove-games-path.patch b/endless-sky-0.10.0-remove-games-path.patch index 56fed28..7d1a6e2 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 @@ +--- a/CMakeLists.txt~ 2023-02-19 15:37:56.000000000 -0600 ++++ b/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"; +--- a/source/Files.cpp~ 2025-01-25 16:21:31.000000000 -0600 ++++ b/source/Files.cpp 2025-01-27 08:47:01.802746790 -0600 +@@ -102,7 +102,7 @@ + // the executable, but are under the same prefix (/usr or /usr/local). + 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; + const auto IsParent = [](const auto parent, const auto child) -> bool { + if(distance(child.begin(), child.end()) < distance(parent.begin(), parent.end())) diff --git a/endless-sky.spec b/endless-sky.spec index 0653c5b..051d1f9 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.16 +Version: 0.10.12 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -31,11 +31,6 @@ 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 @@ -101,24 +96,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 diff --git a/sources b/sources index b186ba4..4346f4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.16.tar.gz) = 8dd8ee8bdb71ceda23024ac07502adab4f246ed3723fdc49d152de1796ba799c8584d31892f357034fa9c7d93c2880278f05cde9c0bd7e7e789eabb0513ba4ca +SHA512 (endless-sky-0.10.12.tar.gz) = 908751e4d0f6df5bfdfc0be99326a3a9e6ef4585e7968b4576c338c9b7904b462628ebec329b1246c7c2edec5a281f28ff389ae754ec92f11743cac5e20d260a