From 0858b6de8e9dd6b73a53df2da2c17dd42d1267d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 23:53:03 +0000 Subject: [PATCH 01/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 9185a68..7afd29c 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -100,6 +100,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.9.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Adam Williamson - 0.9.8-5 - Rebuild to fix GCC 8 mis-compilation See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") From 7248313e723d26cc3c23257e3f5180304735a78b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 13:27:33 +0200 Subject: [PATCH 02/56] - Rebuilt for glew 2.1.0 --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 7afd29c..e836106 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -100,6 +100,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 0.9.8-7 +- Rebuilt for glew 2.1.0 + * Thu Jul 12 2018 Fedora Release Engineering - 0.9.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d622f692cf4431e39169477829ede785c40ef9ba Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 6 Sep 2018 20:20:09 -0400 Subject: [PATCH 03/56] scons is in /usr/bin, even if we're compiling with a different %{_prefix} --- endless-sky.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/endless-sky.spec b/endless-sky.spec index e836106..f25beed 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -58,7 +58,7 @@ sed -i 's/std=c++11/std=gnu++11/' SConstruct %endif CCFLAGS="%{optflags}" \ LDFLAGS="%{?__global_ldflags}" \ -%{_bindir}/scons \ +/usr/bin/scons \ %{?_smp_mflags} \ PREFIX=%{_prefix} @@ -70,7 +70,7 @@ desktop-file-validate %{name}.desktop %install CCFLAGS="%{optflags}" \ LDFLAGS="%{?__global_ldflags}" \ -%{_bindir}/scons \ +/usr/bin/scons \ %{?_smp_mflags} \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} \ @@ -100,6 +100,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Fri Sep 7 2018 Owen Taylor - 0.9.8-8 +- scons is in /usr/bin, even if we're compiling with a different %%{_prefix} + * Thu Aug 23 2018 Nicolas Chauvet - 0.9.8-7 - Rebuilt for glew 2.1.0 From 9c54357b13252e564c8ac90e8d1ce3eed94e86b5 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 15 Jan 2019 10:44:32 -0500 Subject: [PATCH 04/56] Fix compilation with CPLUS_INCLUDE_PATH set for Flatpak builds Scons normally constructs a new clean environment for build commands; this is not necessary in the RPM environment, when the environment is already standardized, and makes things work less reliably. --- endless-sky-0.9.8-environment.patch | 12 ++++++++++++ endless-sky.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 endless-sky-0.9.8-environment.patch diff --git a/endless-sky-0.9.8-environment.patch b/endless-sky-0.9.8-environment.patch new file mode 100644 index 0000000..ace85b4 --- /dev/null +++ b/endless-sky-0.9.8-environment.patch @@ -0,0 +1,12 @@ +diff -up SConstruct.path SConstruct +--- SConstruct.path 2019-01-15 16:29:57.084998841 +0000 ++++ SConstruct 2019-01-15 16:33:21.014998063 +0000 +@@ -1,7 +1,7 @@ + import os + + # Load any environment variables that alter the build. +-env = Environment() ++env = Environment(ENV = os.environ) + if 'CCFLAGS' in os.environ: + env.Append(CCFLAGS = os.environ['CCFLAGS']) + if 'CXXFLAGS' in os.environ: diff --git a/endless-sky.spec b/endless-sky.spec index f25beed..b42b29f 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -15,6 +15,10 @@ Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-% Patch0: endless-sky-0.8.10-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch +# Pass the entire environment to build commands; RPM already standardizes the +# environment. This is needed for CPLUS_INCLUDE_PATH for the Flatpak build, +# but potentially for other things as well. +Patch2: endless-sky-0.9.8-environment.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -100,6 +104,10 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Tue Jan 15 2019 fedora-toolbox - 0.9.8-9 +- Pass the entire environment to build commands; fixes CPLUS_INCLUDE_PATH for + flatpaks. + * Fri Sep 7 2018 Owen Taylor - 0.9.8-8 - scons is in /usr/bin, even if we're compiling with a different %%{_prefix} From 6829255316f9fd566ddf600e26ba9cd2abb618d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 18:40:26 +0000 Subject: [PATCH 05/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index b42b29f..05e6298 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.9.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 15 2019 fedora-toolbox - 0.9.8-9 - Pass the entire environment to build commands; fixes CPLUS_INCLUDE_PATH for flatpaks. From 472611bb75dcff09b3a91d20394ecc89da339a2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 23:30:22 +0000 Subject: [PATCH 06/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 05e6298..881c453 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.9.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.9.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 82732688d43092ac0b01dfdb737419c2b1f251fc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Aug 2019 17:09:48 -0500 Subject: [PATCH 07/56] Flatpak wrapper --- endless-sky-flatpak.sh | 2 ++ endless-sky.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 endless-sky-flatpak.sh diff --git a/endless-sky-flatpak.sh b/endless-sky-flatpak.sh new file mode 100644 index 0000000..bcc3e65 --- /dev/null +++ b/endless-sky-flatpak.sh @@ -0,0 +1,2 @@ +#!/bin/bash +endless-sky -r /app/share/endless-sky diff --git a/endless-sky.spec b/endless-sky.spec index 881c453..0b223ea 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,12 +2,13 @@ Name: endless-sky Version: 0.9.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 URL: https://%{name}.github.io Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz +Source1: endless-sky-flatpak.sh # Replace /usr/games with /usr/bin and /usr/share/games with /usr/share per # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging @@ -80,13 +81,12 @@ LDFLAGS="%{?__global_ldflags}" \ DESTDIR=%{buildroot} \ install install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml - - +install -m755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/ %files %doc README.md %license license.txt -%{_bindir}/%{name} +%{_bindir}/%{name}* %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/22x22/apps/%{name}.png %{_datadir}/icons/hicolor/24x24/apps/%{name}.png @@ -104,6 +104,9 @@ install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name} %changelog +* Wed Aug 21 2019 Gwyn Ciesla - 0.9.8-12 +- Add flatpak wrapper. + * Wed Jul 24 2019 Fedora Release Engineering - 0.9.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f87d265ee5c5d3636e280eaef2f2f3960bc3ce96 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 Aug 2019 07:31:10 -0500 Subject: [PATCH 08/56] Wrapper fix. --- endless-sky-flatpak.sh | 2 -- endless-sky-wrapper | 2 ++ endless-sky.spec | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 endless-sky-flatpak.sh create mode 100644 endless-sky-wrapper diff --git a/endless-sky-flatpak.sh b/endless-sky-flatpak.sh deleted file mode 100644 index bcc3e65..0000000 --- a/endless-sky-flatpak.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -endless-sky -r /app/share/endless-sky diff --git a/endless-sky-wrapper b/endless-sky-wrapper new file mode 100644 index 0000000..5d99dcd --- /dev/null +++ b/endless-sky-wrapper @@ -0,0 +1,2 @@ +#!/bin/bash +endless-sky.bin -r /app/share/endless-sky diff --git a/endless-sky.spec b/endless-sky.spec index 0b223ea..324657b 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -8,7 +8,7 @@ Summary: Space exploration, trading, and combat game License: GPLv3 URL: https://%{name}.github.io Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz -Source1: endless-sky-flatpak.sh +Source1: endless-sky-wrapper # Replace /usr/games with /usr/bin and /usr/share/games with /usr/share per # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging @@ -81,7 +81,9 @@ LDFLAGS="%{?__global_ldflags}" \ DESTDIR=%{buildroot} \ install install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -install -m755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/ +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.bin +install -m755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} +sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %files %doc README.md From e9152819c0e608e3114cb664e9c165b060019fca Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 30 Sep 2019 10:03:48 -0500 Subject: [PATCH 09/56] 0.9.10 --- .gitignore | 1 + endless-sky.spec | 20 +++++++++++--------- sources | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 27118b6..7ab74b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /endless-sky-0.9.8.tar.gz +/endless-sky-0.9.10.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 324657b..093f52e 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,8 +1,8 @@ -%define gittag0 v0.9.8 +%define gittag0 v0.9.10 Name: endless-sky -Version: 0.9.8 -Release: 12%{?dist} +Version: 0.9.10 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -16,10 +16,6 @@ Source1: endless-sky-wrapper Patch0: endless-sky-0.8.10-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch -# Pass the entire environment to build commands; RPM already standardizes the -# environment. This is needed for CPLUS_INCLUDE_PATH for the Flatpak build, -# but potentially for other things as well. -Patch2: endless-sky-0.9.8-environment.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -61,7 +57,7 @@ Images, sound, and game data for %{name}. %ifarch ppc64le sed -i 's/std=c++11/std=gnu++11/' SConstruct %endif -CCFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ LDFLAGS="%{?__global_ldflags}" \ /usr/bin/scons \ %{?_smp_mflags} \ @@ -73,7 +69,7 @@ desktop-file-validate %{name}.desktop %install -CCFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ LDFLAGS="%{?__global_ldflags}" \ /usr/bin/scons \ %{?_smp_mflags} \ @@ -95,6 +91,8 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/256x256/apps/%{name}.png +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_mandir}/man6/%{name}.6.gz @@ -106,6 +104,10 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Sep 30 2019 Gwyn Ciesla - 0.9.10-1 +- 0.9.10 +- Environment patch upstreamed. + * Wed Aug 21 2019 Gwyn Ciesla - 0.9.8-12 - Add flatpak wrapper. diff --git a/sources b/sources index 27dca6d..5160c2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.8.tar.gz) = 521026cb70372fd380b14a1a1d296f86015e5999dc233f4d9c05d958092e1f3982d2f12e913a435d5827fb45945bd4b60bbae293c2c90685024cdae96e352078 +SHA512 (endless-sky-0.9.10.tar.gz) = 4dcfb1a18ccff4121bc365a9c0eb829a19b0ea11c84ecd51f1b331305eeb7391a81f7b7874fb4e316d358e792dddf817a7903085672110c2d64d209e9899b8d9 From 6cf65dc500fbec9f1642d096c9b6acd1b3f75952 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 10:28:39 -0700 Subject: [PATCH 10/56] Add missing #include for gcc-10 --- endless-sky-0.9.10-gcc10.patch | 11 +++++++++++ endless-sky.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 endless-sky-0.9.10-gcc10.patch diff --git a/endless-sky-0.9.10-gcc10.patch b/endless-sky-0.9.10-gcc10.patch new file mode 100644 index 0000000..cd0fd27 --- /dev/null +++ b/endless-sky-0.9.10-gcc10.patch @@ -0,0 +1,11 @@ +diff -Nrup a/source/Panel.h b/source/Panel.h +--- source/Panel.h 2017-08-12 15:37:19.000000000 -0600 ++++ source/Panel.h 2019-09-23 18:00:51.415560466 -0600 +@@ -17,6 +17,7 @@ PARTICULAR PURPOSE. See the GNU General + + #include + #include ++#include + + #include + diff --git a/endless-sky.spec b/endless-sky.spec index 093f52e..1e2ea36 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -16,6 +16,7 @@ Source1: endless-sky-wrapper Patch0: endless-sky-0.8.10-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch +Patch2: endless-sky-0.9.10-gcc10.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -104,6 +105,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Sat Dec 14 2019 Jeff Law - 0.9.10-2 +- Fix missing #include for gcc-10 + * Mon Sep 30 2019 Gwyn Ciesla - 0.9.10-1 - 0.9.10 - Environment patch upstreamed. From 9b3a51d0892b23469d72b3d613beff5ecc97d49c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 17:20:33 +0000 Subject: [PATCH 11/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 1e2ea36..5897e9a 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -105,6 +105,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.9.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 0.9.10-2 - Fix missing #include for gcc-10 From dfada15699e5674d2c53b31947f67c9585526ebf Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 25 Feb 2020 09:31:37 -0600 Subject: [PATCH 12/56] 0.9.11 --- .gitignore | 1 + endless-sky.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7ab74b0..06e2d92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /endless-sky-0.9.8.tar.gz /endless-sky-0.9.10.tar.gz +/endless-sky-0.9.11.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 5897e9a..ec76ffd 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,8 +1,8 @@ -%define gittag0 v0.9.10 +%define gittag0 v0.9.11 Name: endless-sky -Version: 0.9.10 -Release: 3%{?dist} +Version: 0.9.11 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -105,6 +105,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Tue Feb 25 2020 Gwyn Ciesla - 0.9.11-1 +- 0.9.11 + * Tue Jan 28 2020 Fedora Release Engineering - 0.9.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 5160c2f..b516e56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.10.tar.gz) = 4dcfb1a18ccff4121bc365a9c0eb829a19b0ea11c84ecd51f1b331305eeb7391a81f7b7874fb4e316d358e792dddf817a7903085672110c2d64d209e9899b8d9 +SHA512 (endless-sky-0.9.11.tar.gz) = 8e56795fb327fbdc977af056929478e16243b3a4ea8d96feecb59c1c4c0265d54144b6f7c39b2edc09f3bb12dbada8be5fa075a2670f372682cb7b73d9ce6a9f From a7bf3c6a3c12708340aba0186456a5ca5521d3da Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 2 May 2020 14:25:20 -0500 Subject: [PATCH 13/56] 0.9.12 --- .gitignore | 1 + endless-sky.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06e2d92..99e76df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /endless-sky-0.9.8.tar.gz /endless-sky-0.9.10.tar.gz /endless-sky-0.9.11.tar.gz +/endless-sky-0.9.12.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index ec76ffd..5ef681d 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,7 +1,7 @@ -%define gittag0 v0.9.11 +%define gittag0 v0.9.12 Name: endless-sky -Version: 0.9.11 +Version: 0.9.12 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -105,6 +105,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Sat May 02 2020 Gwyn Ciesla - 0.9.12-1 +- 0.9.12 + * Tue Feb 25 2020 Gwyn Ciesla - 0.9.11-1 - 0.9.11 diff --git a/sources b/sources index b516e56..31ec86c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.11.tar.gz) = 8e56795fb327fbdc977af056929478e16243b3a4ea8d96feecb59c1c4c0265d54144b6f7c39b2edc09f3bb12dbada8be5fa075a2670f372682cb7b73d9ce6a9f +SHA512 (endless-sky-0.9.12.tar.gz) = 694d3c6f50f80e8b4ff79580fa9510fde26a846dd227736af96a3eda7810d68b2ae051a72c0e02fe88eae9d839e48933614aa172a9bed6653e03ad30feaddc05 From 10c416b0a2c9cf898e0ad39ed86ee5381243674c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:34:15 +0000 Subject: [PATCH 14/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 5ef681d..afce3f2 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -105,6 +105,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.9.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 02 2020 Gwyn Ciesla - 0.9.12-1 - 0.9.12 From 1fd5dca7dc6b6210dbfb9c3bea72e632a2db8b36 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 14 Oct 2020 07:33:56 -0600 Subject: [PATCH 15/56] Add missing #includes for gcc-11 --- endless-sky-gcc11.patch | 24 ++++++++++++++++++++++++ endless-sky.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 endless-sky-gcc11.patch diff --git a/endless-sky-gcc11.patch b/endless-sky-gcc11.patch new file mode 100644 index 0000000..3255521 --- /dev/null +++ b/endless-sky-gcc11.patch @@ -0,0 +1,24 @@ +diff --git a/source/MapDetailPanel.cpp b/source/MapDetailPanel.cpp +index 79e023d..3786d90 100644 +--- source/MapDetailPanel.cpp ++++ source/MapDetailPanel.cpp +@@ -44,6 +44,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. + #include + #include + #include ++#include + + using namespace std; + +diff --git a/source/PlayerInfo.cpp b/source/PlayerInfo.cpp +index 8630b98..003fa10 100644 +--- source/PlayerInfo.cpp ++++ source/PlayerInfo.cpp +@@ -42,6 +42,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. + #include + #include + #include ++#include + + using namespace std; + diff --git a/endless-sky.spec b/endless-sky.spec index afce3f2..f38e158 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -17,6 +17,7 @@ Patch0: endless-sky-0.8.10-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch Patch2: endless-sky-0.9.10-gcc10.patch +Patch3: endless-sky-gcc11.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -105,6 +106,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Wed Oct 14 2020 Jeff Law - 0.9.12-3 +- Add missing #includes for gcc-11 + * Mon Jul 27 2020 Fedora Release Engineering - 0.9.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 530868f96745206f90c22504eff25969925a3f73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:37:01 +0000 Subject: [PATCH 16/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index f38e158..53dbcb7 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -106,6 +106,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Oct 14 2020 Jeff Law - 0.9.12-3 - Add missing #includes for gcc-11 From 3a6fff5dd87ed559365f13e82e920492256506f3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Apr 2021 09:52:11 -0500 Subject: [PATCH 17/56] 0.9.13 --- .gitignore | 1 + endless-sky-0.9.10-gcc10.patch | 11 ------ ...sky-0.9.13-remove-additional-ccflags.patch | 19 ++++++++++ ...endless-sky-0.9.13-remove-games-path.patch | 36 +++++++++---------- ...-sky-0.9.4-remove-additional-ccflags.patch | 18 ---------- endless-sky-0.9.8-environment.patch | 12 ------- endless-sky-gcc11.patch | 24 ------------- endless-sky.spec | 15 ++++---- sources | 2 +- 9 files changed, 47 insertions(+), 91 deletions(-) delete mode 100644 endless-sky-0.9.10-gcc10.patch create mode 100644 endless-sky-0.9.13-remove-additional-ccflags.patch rename endless-sky-0.8.10-remove-games-path.patch => endless-sky-0.9.13-remove-games-path.patch (73%) delete mode 100644 endless-sky-0.9.4-remove-additional-ccflags.patch delete mode 100644 endless-sky-0.9.8-environment.patch delete mode 100644 endless-sky-gcc11.patch diff --git a/.gitignore b/.gitignore index 99e76df..1991484 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /endless-sky-0.9.10.tar.gz /endless-sky-0.9.11.tar.gz /endless-sky-0.9.12.tar.gz +/endless-sky-0.9.13.tar.gz diff --git a/endless-sky-0.9.10-gcc10.patch b/endless-sky-0.9.10-gcc10.patch deleted file mode 100644 index cd0fd27..0000000 --- a/endless-sky-0.9.10-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/source/Panel.h b/source/Panel.h ---- source/Panel.h 2017-08-12 15:37:19.000000000 -0600 -+++ source/Panel.h 2019-09-23 18:00:51.415560466 -0600 -@@ -17,6 +17,7 @@ PARTICULAR PURPOSE. See the GNU General - - #include - #include -+#include - - #include - diff --git a/endless-sky-0.9.13-remove-additional-ccflags.patch b/endless-sky-0.9.13-remove-additional-ccflags.patch new file mode 100644 index 0000000..de2efc6 --- /dev/null +++ b/endless-sky-0.9.13-remove-additional-ccflags.patch @@ -0,0 +1,19 @@ +--- SConstruct~ 2021-04-19 08:31:12.308058768 -0500 ++++ SConstruct 2021-04-19 08:33:05.998937400 -0500 +@@ -50,15 +50,7 @@ + # $ CXXFLAGS=-msse3 scons + # $ CXXFLAGS=-march=native scons + # or modify the `flags` variable: +-flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"] +-if env["mode"] != "debug": +- flags += ["-O3", "-flto"] +- env.Append(LINKFLAGS = ["-O3", "-flto"]) +-if env["mode"] == "debug": +- flags += ["-g"] +-elif env["mode"] == "profile": +- flags += ["-pg"] +- env.Append(LINKFLAGS = ["-pg"]) ++flags = ["-std=c++11"] + env.Append(CCFLAGS = flags) + # Omit emitting a symbol table when creating/updating static libraries, because Scons + # will run ranlib. If we are using gcc-ranlib, assume support for thin archives as well. diff --git a/endless-sky-0.8.10-remove-games-path.patch b/endless-sky-0.9.13-remove-games-path.patch similarity index 73% rename from endless-sky-0.8.10-remove-games-path.patch rename to endless-sky-0.9.13-remove-games-path.patch index ea5bc58..32a3e24 100644 --- a/endless-sky-0.8.10-remove-games-path.patch +++ b/endless-sky-0.9.13-remove-games-path.patch @@ -1,17 +1,7 @@ -diff -up ./SConstruct.orig ./SConstruct ---- ./SConstruct.orig 2016-01-11 20:28:45.250276511 -0800 -+++ ./SConstruct 2016-01-11 20:29:13.778912624 -0800 -@@ -43,7 +43,7 @@ sky = env.Program("endless-sky", Glob("b - - - # Install the binary: --env.Install("$DESTDIR$PREFIX/games", sky) -+env.Install("$DESTDIR$PREFIX/bin", sky) - - # Install the desktop file: - env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") -@@ -81,11 +81,11 @@ def RecursiveInstall(env, target, source - RecursiveInstall(env, os.path.join(target, name), node.abspath) +--- SConstruct~ 2021-04-19 08:27:12.592216308 -0500 ++++ SConstruct 2021-04-19 08:29:26.504082300 -0500 +@@ -191,11 +191,11 @@ + RecursiveInstall(env, pathjoin(target, name), node.abspath) else: env.Install(target, node) -RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") @@ -27,10 +17,20 @@ diff -up ./SConstruct.orig ./SConstruct # Make the word "install" in the command line do an installation. env.Alias("install", "$DESTDIR$PREFIX") -diff -up ./source/Files.cpp.orig ./source/Files.cpp ---- ./source/Files.cpp.orig 2016-01-11 20:29:22.100806482 -0800 -+++ ./source/Files.cpp 2016-01-11 20:29:35.419636593 -0800 -@@ -115,7 +115,7 @@ void Files::Init(const char * const *arg +--- SConstruct~ 2021-04-19 08:35:52.599227069 -0500 ++++ SConstruct 2021-04-19 08:49:58.917530861 -0500 +@@ -142,7 +142,7 @@ + + + # Install the binary: +-env.Install("$DESTDIR$PREFIX/games", sky) ++env.Install("$DESTDIR$PREFIX/bin", sky) + + # Install the desktop file: + env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") +--- source/Files.cpp~ 2021-04-17 09:40:38.000000000 -0500 ++++ source/Files.cpp 2021-04-19 09:05:31.921109831 -0500 +@@ -119,7 +119,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/"; diff --git a/endless-sky-0.9.4-remove-additional-ccflags.patch b/endless-sky-0.9.4-remove-additional-ccflags.patch deleted file mode 100644 index 7620701..0000000 --- a/endless-sky-0.9.4-remove-additional-ccflags.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- SConstruct.orig 2017-09-13 20:00:51.154361127 -0700 -+++ SConstruct 2017-09-13 20:24:45.396884800 -0700 -@@ -25,14 +25,7 @@ - - Help(opts.GenerateHelpText(env)) - --flags = ["-std=c++11", "-Wall"] --if env["mode"] != "debug": -- flags += ["-O3"] --if env["mode"] == "debug": -- flags += ["-g"] --if env["mode"] == "profile": -- flags += ["-pg"] -- env.Append(LINKFLAGS = ["-pg"]) -+flags = ["-std=c++11"] - - # Required build flags. If you want to use SSE optimization, you can turn on - # -msse3 or (if just building for your own computer) -march=native. diff --git a/endless-sky-0.9.8-environment.patch b/endless-sky-0.9.8-environment.patch deleted file mode 100644 index ace85b4..0000000 --- a/endless-sky-0.9.8-environment.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up SConstruct.path SConstruct ---- SConstruct.path 2019-01-15 16:29:57.084998841 +0000 -+++ SConstruct 2019-01-15 16:33:21.014998063 +0000 -@@ -1,7 +1,7 @@ - import os - - # Load any environment variables that alter the build. --env = Environment() -+env = Environment(ENV = os.environ) - if 'CCFLAGS' in os.environ: - env.Append(CCFLAGS = os.environ['CCFLAGS']) - if 'CXXFLAGS' in os.environ: diff --git a/endless-sky-gcc11.patch b/endless-sky-gcc11.patch deleted file mode 100644 index 3255521..0000000 --- a/endless-sky-gcc11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/source/MapDetailPanel.cpp b/source/MapDetailPanel.cpp -index 79e023d..3786d90 100644 ---- source/MapDetailPanel.cpp -+++ source/MapDetailPanel.cpp -@@ -44,6 +44,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. - #include - #include - #include -+#include - - using namespace std; - -diff --git a/source/PlayerInfo.cpp b/source/PlayerInfo.cpp -index 8630b98..003fa10 100644 ---- source/PlayerInfo.cpp -+++ source/PlayerInfo.cpp -@@ -42,6 +42,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. - #include - #include - #include -+#include - - using namespace std; - diff --git a/endless-sky.spec b/endless-sky.spec index 53dbcb7..a2c3e0b 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,8 +1,8 @@ -%define gittag0 v0.9.12 +%define gittag0 v0.9.13 Name: endless-sky -Version: 0.9.12 -Release: 4%{?dist} +Version: 0.9.13 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -13,11 +13,9 @@ Source1: endless-sky-wrapper # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. -Patch0: endless-sky-0.8.10-remove-games-path.patch +Patch0: endless-sky-0.9.13-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. -Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch -Patch2: endless-sky-0.9.10-gcc10.patch -Patch3: endless-sky-gcc11.patch +Patch1: endless-sky-0.9.13-remove-additional-ccflags.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -106,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Apr 19 2021 Gwyn Ciesla - 0.9.13-1 +- 0.9.13 + * Tue Jan 26 2021 Fedora Release Engineering - 0.9.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 31ec86c..b3719cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.12.tar.gz) = 694d3c6f50f80e8b4ff79580fa9510fde26a846dd227736af96a3eda7810d68b2ae051a72c0e02fe88eae9d839e48933614aa172a9bed6653e03ad30feaddc05 +SHA512 (endless-sky-0.9.13.tar.gz) = 8bced454ac4ca1250637aedefa47adfd2ccd20ae69958ada44a6f75c92a1ff8c78705ccbba5caa373d047a19bbc71529b8645e36023b05324c239e4df9aae9cc From 81bef81147e6fa046ff1757e9fb77751813461eb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 12 Jul 2021 12:41:37 -0500 Subject: [PATCH 18/56] 0.9.14 --- .gitignore | 1 + ... endless-sky-0.9.14-remove-additional-ccflags.patch | 10 +++++----- endless-sky.spec | 9 ++++++--- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) rename endless-sky-0.9.13-remove-additional-ccflags.patch => endless-sky-0.9.14-remove-additional-ccflags.patch (59%) diff --git a/.gitignore b/.gitignore index 1991484..8c1b67a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /endless-sky-0.9.11.tar.gz /endless-sky-0.9.12.tar.gz /endless-sky-0.9.13.tar.gz +/endless-sky-0.9.14.tar.gz diff --git a/endless-sky-0.9.13-remove-additional-ccflags.patch b/endless-sky-0.9.14-remove-additional-ccflags.patch similarity index 59% rename from endless-sky-0.9.13-remove-additional-ccflags.patch rename to endless-sky-0.9.14-remove-additional-ccflags.patch index de2efc6..e11f603 100644 --- a/endless-sky-0.9.13-remove-additional-ccflags.patch +++ b/endless-sky-0.9.14-remove-additional-ccflags.patch @@ -1,6 +1,6 @@ ---- SConstruct~ 2021-04-19 08:31:12.308058768 -0500 -+++ SConstruct 2021-04-19 08:33:05.998937400 -0500 -@@ -50,15 +50,7 @@ +--- SConstruct~ 2021-07-12 11:55:10.366672469 -0500 ++++ SConstruct 2021-07-12 11:57:10.358812423 -0500 +@@ -46,15 +46,7 @@ # $ CXXFLAGS=-msse3 scons # $ CXXFLAGS=-march=native scons # or modify the `flags` variable: @@ -15,5 +15,5 @@ - env.Append(LINKFLAGS = ["-pg"]) +flags = ["-std=c++11"] env.Append(CCFLAGS = flags) - # Omit emitting a symbol table when creating/updating static libraries, because Scons - # will run ranlib. If we are using gcc-ranlib, assume support for thin archives as well. + + # Always use `ar` to create the symbol table, and don't use ranlib at all, since it fails to preserve diff --git a/endless-sky.spec b/endless-sky.spec index a2c3e0b..b13502a 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,7 +1,7 @@ -%define gittag0 v0.9.13 +%define gittag0 v0.9.14 Name: endless-sky -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -15,7 +15,7 @@ Source1: endless-sky-wrapper # standards where the use of /usr/games is acceptable. Patch0: endless-sky-0.9.13-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. -Patch1: endless-sky-0.9.13-remove-additional-ccflags.patch +Patch1: endless-sky-0.9.14-remove-additional-ccflags.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Jul 12 2021 Gwyn Ciesla - 0.9.14-1 +- 0.9.14 + * Mon Apr 19 2021 Gwyn Ciesla - 0.9.13-1 - 0.9.13 diff --git a/sources b/sources index b3719cb..4e61018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.13.tar.gz) = 8bced454ac4ca1250637aedefa47adfd2ccd20ae69958ada44a6f75c92a1ff8c78705ccbba5caa373d047a19bbc71529b8645e36023b05324c239e4df9aae9cc +SHA512 (endless-sky-0.9.14.tar.gz) = 861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5 From e847e5b16c96fda867b64cdc7efb25d8a041e844 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:00:24 +0000 Subject: [PATCH 19/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index b13502a..2b4bfa0 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.9.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 12 2021 Gwyn Ciesla - 0.9.14-1 - 0.9.14 From edb3673f0a2a9864054ba21127ded6066d043caa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:00:04 +0000 Subject: [PATCH 20/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 2b4bfa0..aecd820 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.9.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.9.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6a1d9dcd683a00bf7fd2f15e1f428da178224019 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 20:47:27 -0700 Subject: [PATCH 21/56] Rebuild for glew 2.2 --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index aecd820..87ec57f 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Thu Feb 10 2022 Orion Poplawski - 0.9.14-4 +- Rebuild for glew 2.2 + * Thu Jan 20 2022 Fedora Release Engineering - 0.9.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 60fbbddae2b74e742e8b4aaa14514bbd38742410 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:03:34 +0000 Subject: [PATCH 22/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 87ec57f..b5ce63f 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -2,7 +2,7 @@ Name: endless-sky Version: 0.9.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.9.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Feb 10 2022 Orion Poplawski - 0.9.14-4 - Rebuild for glew 2.2 From 36b55b30a24a81bdce991c248f5af06189c95513 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Tue, 4 Oct 2022 20:14:10 -0400 Subject: [PATCH 23/56] new upstream version 0.9.15 --- .gitignore | 1 + endless-sky-0.9.14-remove-additional-ccflags.patch | 4 ++-- endless-sky.spec | 13 +++++++++---- sources | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8c1b67a..5330758 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /endless-sky-0.9.12.tar.gz /endless-sky-0.9.13.tar.gz /endless-sky-0.9.14.tar.gz +/endless-sky-0.9.15.tar.gz diff --git a/endless-sky-0.9.14-remove-additional-ccflags.patch b/endless-sky-0.9.14-remove-additional-ccflags.patch index e11f603..3dbb606 100644 --- a/endless-sky-0.9.14-remove-additional-ccflags.patch +++ b/endless-sky-0.9.14-remove-additional-ccflags.patch @@ -4,9 +4,9 @@ # $ CXXFLAGS=-msse3 scons # $ CXXFLAGS=-march=native scons # or modify the `flags` variable: --flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"] +-flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"] -if env["mode"] != "debug": -- flags += ["-O3", "-flto"] +- flags += ["-Werror", "-O3", "-flto"] - env.Append(LINKFLAGS = ["-O3", "-flto"]) -if env["mode"] == "debug": - flags += ["-g"] diff --git a/endless-sky.spec b/endless-sky.spec index b5ce63f..e93fc45 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,14 +1,14 @@ -%define gittag0 v0.9.14 +%define gittag0 v0.9.15 Name: endless-sky -Version: 0.9.14 -Release: 5%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 URL: https://%{name}.github.io Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz -Source1: endless-sky-wrapper +Source1: endless-sky-wrapper # Replace /usr/games with /usr/bin and /usr/share/games with /usr/share per # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging @@ -28,6 +28,7 @@ BuildRequires: libjpeg-turbo-devel BuildRequires: libappstream-glib BuildRequires: desktop-file-utils BuildRequires: libmad-devel +BuildRequires: libuuid-devel %description Explore other star systems. Earn money by trading, carrying passengers, or @@ -95,6 +96,7 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_mandir}/man6/%{name}.6.gz @@ -104,6 +106,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Tue Oct 04 2022 Link Dupont - 0.9.15-1 +- 0.9.15 + * Thu Jul 21 2022 Fedora Release Engineering - 0.9.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 4e61018..85f5787 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.14.tar.gz) = 861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5 +SHA512 (endless-sky-0.9.15.tar.gz) = 9502cb2f5306ccbec688223b72bbc3ec52b0a0fd9b9b7d02ba454fc8c4081e413d302e05194ca969128ea0fd487a648a8df37d3582f53b38342ad4aa3f58911b From 374f1b24a031ddae83208b7d2a37a585a6b11dcb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Oct 2022 09:10:31 -0500 Subject: [PATCH 24/56] 0.9.16 --- .gitignore | 1 + endless-sky.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5330758..693b9fc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /endless-sky-0.9.13.tar.gz /endless-sky-0.9.14.tar.gz /endless-sky-0.9.15.tar.gz +/endless-sky-0.9.16.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index e93fc45..e361cc0 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,7 +1,7 @@ %define gittag0 v0.9.15 Name: endless-sky -Version: 0.9.15 +Version: 0.9.16 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -51,8 +51,11 @@ Images, sound, and game data for %{name}. %prep -%autosetup -p0 - +#%%autosetup -p0 +#until upstream fixes the folder name +%setup -qn endless-sky-0.9.15 +%patch0 -p0 +%patch1 -p0 %build %ifarch ppc64le @@ -106,6 +109,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Oct 17 2022 Gwyn Ciesla - 0.9.16-1 +- 0.9.16 + * Tue Oct 04 2022 Link Dupont - 0.9.15-1 - 0.9.15 diff --git a/sources b/sources index 85f5787..5ef83bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.15.tar.gz) = 9502cb2f5306ccbec688223b72bbc3ec52b0a0fd9b9b7d02ba454fc8c4081e413d302e05194ca969128ea0fd487a648a8df37d3582f53b38342ad4aa3f58911b +SHA512 (endless-sky-0.9.16.tar.gz) = 9502cb2f5306ccbec688223b72bbc3ec52b0a0fd9b9b7d02ba454fc8c4081e413d302e05194ca969128ea0fd487a648a8df37d3582f53b38342ad4aa3f58911b From 116c97a1c267bd49718f028513d47b520c0309b6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Oct 2022 10:05:00 -0500 Subject: [PATCH 25/56] Fix source --- endless-sky.spec | 19 +++++++------------ sources | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/endless-sky.spec b/endless-sky.spec index e361cc0..7627801 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,3 @@ -%define gittag0 v0.9.15 - Name: endless-sky Version: 0.9.16 Release: 1%{?dist} @@ -7,7 +5,7 @@ Summary: Space exploration, trading, and combat game License: GPLv3 URL: https://%{name}.github.io -Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: endless-sky-wrapper # Replace /usr/games with /usr/bin and /usr/share/games with /usr/share per # https://fedoraproject.org/wiki/SIGs/Games/Packaging. @@ -51,11 +49,8 @@ Images, sound, and game data for %{name}. %prep -#%%autosetup -p0 -#until upstream fixes the folder name -%setup -qn endless-sky-0.9.15 -%patch0 -p0 -%patch1 -p0 +%autosetup -p0 + %build %ifarch ppc64le @@ -68,7 +63,7 @@ LDFLAGS="%{?__global_ldflags}" \ PREFIX=%{_prefix} %check -appstream-util validate-relax --nonet %{name}.appdata.xml +appstream-util validate-relax --nonet io.github.endless_sky.endless_sky.appdata.xml desktop-file-validate %{name}.desktop @@ -80,7 +75,7 @@ LDFLAGS="%{?__global_ldflags}" \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} \ install -install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -m644 -D io.github.endless_sky.endless_sky.appdata.xml %{buildroot}%{_datadir}/appdata/io.github.endless_sky.endless_sky.appdata.xml mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.bin install -m755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} @@ -98,8 +93,8 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/appdata/io.github.endless_sky.endless_sky.appdata.xml +%{_datadir}/metainfo/io.github.endless_sky.endless_sky.appdata.xml %{_mandir}/man6/%{name}.6.gz diff --git a/sources b/sources index 5ef83bc..463ed7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.16.tar.gz) = 9502cb2f5306ccbec688223b72bbc3ec52b0a0fd9b9b7d02ba454fc8c4081e413d302e05194ca969128ea0fd487a648a8df37d3582f53b38342ad4aa3f58911b +SHA512 (endless-sky-0.9.16.tar.gz) = d0b4f708b6cf614881610628eebea2e9a10926cef5d010326119b59788d4a59297028db44b2b53664866e3e12efd76bd692d630dabbb9196a93aa7f3f04ca0fc From 32a3b7c9b789144295cb4fe3f42fb06758df0044 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 19 Oct 2022 11:21:16 -0500 Subject: [PATCH 26/56] 0.9.16.1 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 693b9fc..60468a9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /endless-sky-0.9.14.tar.gz /endless-sky-0.9.15.tar.gz /endless-sky-0.9.16.tar.gz +/endless-sky-0.9.16.1.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 7627801..7ecf870 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.9.16 +Version: 0.9.16.1 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Wed Oct 19 2022 Gwyn Ciesla - 0.9.16.1-1 +- 0.9.16.1 + * Mon Oct 17 2022 Gwyn Ciesla - 0.9.16-1 - 0.9.16 diff --git a/sources b/sources index 463ed7b..a1f3cb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.16.tar.gz) = d0b4f708b6cf614881610628eebea2e9a10926cef5d010326119b59788d4a59297028db44b2b53664866e3e12efd76bd692d630dabbb9196a93aa7f3f04ca0fc +SHA512 (endless-sky-0.9.16.1.tar.gz) = 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56 From d0466952bf0fecb6e6617b751a0edc428d5e3df2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:23:37 +0000 Subject: [PATCH 27/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 7ecf870..c15f873 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.9.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -104,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.9.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Oct 19 2022 Gwyn Ciesla - 0.9.16.1-1 - 0.9.16.1 From d4a51f979b93392ea988f3a5ac3b207e09ea3876 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 22 Feb 2023 09:46:27 -0600 Subject: [PATCH 28/56] 0.10.0 --- .gitignore | 1 + cstdint.patch | 7 ++++ endless-sky-0.10.0-remove-games-path.patch | 30 ++++++++++++++ endless-sky-0.9.13-remove-games-path.patch | 41 ------------------- ...sky-0.9.14-remove-additional-ccflags.patch | 19 --------- endless-sky.spec | 40 ++++++++---------- sources | 2 +- 7 files changed, 56 insertions(+), 84 deletions(-) create mode 100644 cstdint.patch create mode 100644 endless-sky-0.10.0-remove-games-path.patch delete mode 100644 endless-sky-0.9.13-remove-games-path.patch delete mode 100644 endless-sky-0.9.14-remove-additional-ccflags.patch diff --git a/.gitignore b/.gitignore index 60468a9..5dc3500 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /endless-sky-0.9.15.tar.gz /endless-sky-0.9.16.tar.gz /endless-sky-0.9.16.1.tar.gz +/endless-sky-0.10.0.tar.gz diff --git a/cstdint.patch b/cstdint.patch new file mode 100644 index 0000000..6c3854a --- /dev/null +++ b/cstdint.patch @@ -0,0 +1,7 @@ +--- source/Preferences.h ++++ source/Preferences.h +@@ -17,6 +17,7 @@ this program. If not, see . + #define PREFERENCES_H_ + + #include ++#include diff --git a/endless-sky-0.10.0-remove-games-path.patch b/endless-sky-0.10.0-remove-games-path.patch new file mode 100644 index 0000000..b553f01 --- /dev/null +++ b/endless-sky-0.10.0-remove-games-path.patch @@ -0,0 +1,30 @@ +--- 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 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 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) +--- 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-0.9.13-remove-games-path.patch b/endless-sky-0.9.13-remove-games-path.patch deleted file mode 100644 index 32a3e24..0000000 --- a/endless-sky-0.9.13-remove-games-path.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- SConstruct~ 2021-04-19 08:27:12.592216308 -0500 -+++ SConstruct 2021-04-19 08:29:26.504082300 -0500 -@@ -191,11 +191,11 @@ - RecursiveInstall(env, pathjoin(target, name), node.abspath) - else: - env.Install(target, node) --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images") --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds") --env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt") --env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds") -+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt") -+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt") - - # Make the word "install" in the command line do an installation. - env.Alias("install", "$DESTDIR$PREFIX") ---- SConstruct~ 2021-04-19 08:35:52.599227069 -0500 -+++ SConstruct 2021-04-19 08:49:58.917530861 -0500 -@@ -142,7 +142,7 @@ - - - # Install the binary: --env.Install("$DESTDIR$PREFIX/games", sky) -+env.Install("$DESTDIR$PREFIX/bin", sky) - - # Install the desktop file: - env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") ---- source/Files.cpp~ 2021-04-17 09:40:38.000000000 -0500 -+++ source/Files.cpp 2021-04-19 09:05:31.921109831 -0500 -@@ -119,7 +119,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-0.9.14-remove-additional-ccflags.patch b/endless-sky-0.9.14-remove-additional-ccflags.patch deleted file mode 100644 index 3dbb606..0000000 --- a/endless-sky-0.9.14-remove-additional-ccflags.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- SConstruct~ 2021-07-12 11:55:10.366672469 -0500 -+++ SConstruct 2021-07-12 11:57:10.358812423 -0500 -@@ -46,15 +46,7 @@ - # $ CXXFLAGS=-msse3 scons - # $ CXXFLAGS=-march=native scons - # or modify the `flags` variable: --flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"] --if env["mode"] != "debug": -- flags += ["-Werror", "-O3", "-flto"] -- env.Append(LINKFLAGS = ["-O3", "-flto"]) --if env["mode"] == "debug": -- flags += ["-g"] --elif env["mode"] == "profile": -- flags += ["-pg"] -- env.Append(LINKFLAGS = ["-pg"]) -+flags = ["-std=c++11"] - env.Append(CCFLAGS = flags) - - # Always use `ar` to create the symbol table, and don't use ranlib at all, since it fails to preserve diff --git a/endless-sky.spec b/endless-sky.spec index c15f873..de3acd1 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.9.16.1 -Release: 2%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -11,12 +11,12 @@ Source1: endless-sky-wrapper # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. -Patch0: endless-sky-0.9.13-remove-games-path.patch -# Unset CCFLAGS override inside SConstruct. -Patch1: endless-sky-0.9.14-remove-additional-ccflags.patch +Patch0: endless-sky-0.10.0-remove-games-path.patch +Patch1: cstdint.patch Requires: %{name}-data = %{version}-%{release} -BuildRequires: scons +BuildRequires: cmake +BuildRequires: ninja-build BuildRequires: gcc-c++ BuildRequires: SDL2-devel BuildRequires: openal-soft-devel @@ -27,6 +27,7 @@ BuildRequires: libappstream-glib BuildRequires: desktop-file-utils BuildRequires: libmad-devel BuildRequires: libuuid-devel +BuildRequires: mesa-libGL-devel %description Explore other star systems. Earn money by trading, carrying passengers, or @@ -53,14 +54,8 @@ Images, sound, and game data for %{name}. %build -%ifarch ppc64le -sed -i 's/std=c++11/std=gnu++11/' SConstruct -%endif -CXXFLAGS="%{optflags}" \ -LDFLAGS="%{?__global_ldflags}" \ -/usr/bin/scons \ - %{?_smp_mflags} \ - PREFIX=%{_prefix} +%cmake -DES_USE_VCPKG=OFF +%cmake_build %check appstream-util validate-relax --nonet io.github.endless_sky.endless_sky.appdata.xml @@ -68,20 +63,16 @@ desktop-file-validate %{name}.desktop %install -CXXFLAGS="%{optflags}" \ -LDFLAGS="%{?__global_ldflags}" \ -/usr/bin/scons \ - %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - DESTDIR=%{buildroot} \ - install +%cmake_install install -m644 -D io.github.endless_sky.endless_sky.appdata.xml %{buildroot}%{_datadir}/appdata/io.github.endless_sky.endless_sky.appdata.xml -mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.bin +mkdir -p %{buildroot}%{_bindir} +install redhat-linux-build/%{name} %{buildroot}%{_bindir}/%{name}.bin install -m755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} +rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %files -%doc README.md +%doc README.md changelog copyright %license license.txt %{_bindir}/%{name}* %{_datadir}/icons/hicolor/16x16/apps/%{name}.png @@ -104,6 +95,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Tue Feb 21 2023 Gwyn Ciesla - 0.10.0-1 +- 0.10.0 + * Thu Jan 19 2023 Fedora Release Engineering - 0.9.16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a1f3cb6..fbf9299 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.16.1.tar.gz) = 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56 +SHA512 (endless-sky-0.10.0.tar.gz) = a9e5f42832c439e31c56447434032d12f16383ecbe52b87b64ddd3623c6a9564ae23b56b94f4edf354c119726039270ac97cb54088b03e772947618379e462f8 From b8d32cda68fa7f0b340ae0330f83c743f0da8983 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Jun 2023 11:13:58 -0500 Subject: [PATCH 29/56] 0.10.2 --- .gitignore | 1 + cstdint.patch | 7 ------- endless-sky.spec | 6 ++++-- sources | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 cstdint.patch diff --git a/.gitignore b/.gitignore index 5dc3500..1fb7f21 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /endless-sky-0.9.16.tar.gz /endless-sky-0.9.16.1.tar.gz /endless-sky-0.10.0.tar.gz +/endless-sky-0.10.2.tar.gz diff --git a/cstdint.patch b/cstdint.patch deleted file mode 100644 index 6c3854a..0000000 --- a/cstdint.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- source/Preferences.h -+++ source/Preferences.h -@@ -17,6 +17,7 @@ this program. If not, see . - #define PREFERENCES_H_ - - #include -+#include diff --git a/endless-sky.spec b/endless-sky.spec index de3acd1..3280cfb 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.0 +Version: 0.10.2 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -12,7 +12,6 @@ Source1: endless-sky-wrapper # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. Patch0: endless-sky-0.10.0-remove-games-path.patch -Patch1: cstdint.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: cmake @@ -95,6 +94,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Tue Jun 20 2023 Gwyn Ciesla - 0.10.2-1 +- 0.10.2 + * Tue Feb 21 2023 Gwyn Ciesla - 0.10.0-1 - 0.10.0 diff --git a/sources b/sources index fbf9299..5ca9c5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.0.tar.gz) = a9e5f42832c439e31c56447434032d12f16383ecbe52b87b64ddd3623c6a9564ae23b56b94f4edf354c119726039270ac97cb54088b03e772947618379e462f8 +SHA512 (endless-sky-0.10.2.tar.gz) = df365a9cd3b70a839572d9e2db9be425303d9010fff5f10b3050f812a7841c6e08c180ee0e9616b9d26587c4c63ce5c4241da87e2d4653a5bed841e34c971e52 From f0dbc984280de50e2cd9a49c9d3ec3a9de91f435 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Jun 2023 23:02:24 +0200 Subject: [PATCH 30/56] Don't install duplicate appdata file The appdata file was installed to both metainfo/ and appdata/ directories, which is redundant. --- endless-sky.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/endless-sky.spec b/endless-sky.spec index 3280cfb..6246aca 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -63,7 +63,6 @@ desktop-file-validate %{name}.desktop %install %cmake_install -install -m644 -D io.github.endless_sky.endless_sky.appdata.xml %{buildroot}%{_datadir}/appdata/io.github.endless_sky.endless_sky.appdata.xml mkdir -p %{buildroot}%{_bindir} install redhat-linux-build/%{name} %{buildroot}%{_bindir}/%{name}.bin install -m755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} @@ -83,7 +82,6 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/io.github.endless_sky.endless_sky.appdata.xml %{_datadir}/metainfo/io.github.endless_sky.endless_sky.appdata.xml %{_mandir}/man6/%{name}.6.gz @@ -94,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Tue Jun 20 2023 Kalev Lember - 0.10.2-2 +- Don't install duplicate appdata file + * Tue Jun 20 2023 Gwyn Ciesla - 0.10.2-1 - 0.10.2 From b49ef8d295cb59c627da95bebb5c0e77cdb55207 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:32:49 +0000 Subject: [PATCH 31/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 6246aca..a140952 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.10.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 20 2023 Kalev Lember - 0.10.2-2 - Don't install duplicate appdata file From baee31ed4b66e9f60b4d939b3dc235b94f48621a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Oct 2023 09:29:24 -0500 Subject: [PATCH 32/56] 0.10.3 --- endless-sky.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/endless-sky.spec b/endless-sky.spec index a140952..4a935e2 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.10.2 -Release: 3%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Mon Oct 02 2023 Gwyn Ciesla - 0.10.3-1 +- 0.10.3 + * Wed Jul 19 2023 Fedora Release Engineering - 0.10.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6f7685dcae9683b0fc8dcb27e88e9a3fe7ff9fad Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Oct 2023 09:30:20 -0500 Subject: [PATCH 33/56] 0.10.3 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1fb7f21..6c070b9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /endless-sky-0.9.16.1.tar.gz /endless-sky-0.10.0.tar.gz /endless-sky-0.10.2.tar.gz +/endless-sky-0.10.3.tar.gz diff --git a/sources b/sources index 5ca9c5e..00f8bc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.2.tar.gz) = df365a9cd3b70a839572d9e2db9be425303d9010fff5f10b3050f812a7841c6e08c180ee0e9616b9d26587c4c63ce5c4241da87e2d4653a5bed841e34c971e52 +SHA512 (endless-sky-0.10.3.tar.gz) = 51bb5af4ba6ab97f809fa95fa4e785b3023fc779f94d5554048a80ab413431956b74ef202c29919a9c5b6f744142e85617f26887d71ede0560ebc7007c33abd3 From 261c650824cfaa1ec257c03016c0822c4e3d3aae Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 23 Oct 2023 10:16:28 -0500 Subject: [PATCH 34/56] 0.10.4 --- .gitignore | 1 + endless-sky.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c070b9..dee8306 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /endless-sky-0.10.0.tar.gz /endless-sky-0.10.2.tar.gz /endless-sky-0.10.3.tar.gz +/endless-sky-0.10.4.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 4a935e2..825edb3 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.3 +Version: 0.10.4 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -58,7 +58,7 @@ Images, sound, and game data for %{name}. %check appstream-util validate-relax --nonet io.github.endless_sky.endless_sky.appdata.xml -desktop-file-validate %{name}.desktop +desktop-file-validate io.github.endless_sky.endless_sky.desktop %install @@ -81,7 +81,7 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %{_datadir}/icons/hicolor/256x256/apps/%{name}.png %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/512x512/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/io.github.endless_sky.endless_sky.desktop %{_datadir}/metainfo/io.github.endless_sky.endless_sky.appdata.xml %{_mandir}/man6/%{name}.6.gz @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Mon Oct 23 2023 Gwyn Ciesla - 0.10.4-1 +- 0.10.4 + * Mon Oct 02 2023 Gwyn Ciesla - 0.10.3-1 - 0.10.3 diff --git a/sources b/sources index 00f8bc6..ade3376 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.3.tar.gz) = 51bb5af4ba6ab97f809fa95fa4e785b3023fc779f94d5554048a80ab413431956b74ef202c29919a9c5b6f744142e85617f26887d71ede0560ebc7007c33abd3 +SHA512 (endless-sky-0.10.4.tar.gz) = 8f47b398c0667418d38d7c5bed7e793738764bc832d7a8d87809540ed74bf42c557eb30266b0d7b0579b8ec0a9ae5284be8cf39b071b4552df9200601ca830a8 From eb5426522940726ac2eaebb927594349a9dfcfce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 18:13:23 +0000 Subject: [PATCH 35/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 825edb3..9ef20e6 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.10.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 23 2023 Gwyn Ciesla - 0.10.4-1 - 0.10.4 From d383e0f248a4c649e44996f2779c44249640cea6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:26:45 +0000 Subject: [PATCH 36/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 9ef20e6..d687a53 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.10.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9764b52223df3748b08c0e4996dd7bf6a4a11b5b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 29 Jan 2024 09:11:52 -0600 Subject: [PATCH 37/56] 0.10.5 --- .gitignore | 1 + endless-sky.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dee8306..f6ee174 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /endless-sky-0.10.2.tar.gz /endless-sky-0.10.3.tar.gz /endless-sky-0.10.4.tar.gz +/endless-sky-0.10.5.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index d687a53..381b1ea 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.10.4 -Release: 3%{?dist} +Version: 0.10.5 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Mon Jan 29 2024 Gwyn Ciesla - 0.10.5-1 +- 0.10.5 + * Wed Jan 24 2024 Fedora Release Engineering - 0.10.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index ade3376..e32ce67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.4.tar.gz) = 8f47b398c0667418d38d7c5bed7e793738764bc832d7a8d87809540ed74bf42c557eb30266b0d7b0579b8ec0a9ae5284be8cf39b071b4552df9200601ca830a8 +SHA512 (endless-sky-0.10.5.tar.gz) = f127d07613d48500e75bcb9c5c4ca17053cb6e268b293a8b1e3ba5ef4d5075c1780454902b95abd878ecde871d5d329828acf24f484bc310266750456723f0e7 From 51fba11d53008220e39c2d09d513109ce1f37115 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Feb 2024 14:25:00 -0600 Subject: [PATCH 38/56] 0.10.6 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f6ee174..7f69601 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /endless-sky-0.10.3.tar.gz /endless-sky-0.10.4.tar.gz /endless-sky-0.10.5.tar.gz +/endless-sky-0.10.6.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 381b1ea..798c6a4 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.5 +Version: 0.10.6 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Mon Feb 19 2024 Gwyn Ciesla - 0.10.6-1 +- 0.10.6 + * Mon Jan 29 2024 Gwyn Ciesla - 0.10.5-1 - 0.10.5 diff --git a/sources b/sources index e32ce67..57c2124 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.5.tar.gz) = f127d07613d48500e75bcb9c5c4ca17053cb6e268b293a8b1e3ba5ef4d5075c1780454902b95abd878ecde871d5d329828acf24f484bc310266750456723f0e7 +SHA512 (endless-sky-0.10.6.tar.gz) = 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530 From 2a6077ebf2bb0a461d7b46411906751290de5a35 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 28 May 2024 11:54:43 -0500 Subject: [PATCH 39/56] 0.10.7 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7f69601..e1e5f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /endless-sky-0.10.4.tar.gz /endless-sky-0.10.5.tar.gz /endless-sky-0.10.6.tar.gz +/endless-sky-0.10.7.tar.gz diff --git a/endless-sky.spec b/endless-sky.spec index 798c6a4..520a617 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.6 +Version: 0.10.7 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* Tue May 28 2024 Gwyn Ciesla - 0.10.7-1 +- 0.10.7 + * Mon Feb 19 2024 Gwyn Ciesla - 0.10.6-1 - 0.10.6 diff --git a/sources b/sources index 57c2124..f14cafc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.6.tar.gz) = 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530 +SHA512 (endless-sky-0.10.7.tar.gz) = e85d648b9903f5c44a2748f5be410e510987618841744ceffd23ae826dc56cf411c5e7f07979597a050d703443c1540ef63ce709608a2078789233b660be4ea2 From 37fb38bedfbcb325cfa674c557fc3c634480379c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 24 Jun 2024 11:41:59 -0500 Subject: [PATCH 40/56] 0.10.8 --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 520a617..0cef7fd 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.7 +Version: 0.10.8 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From ae676b5ab7e0e4a93c066545ad6bfe0977fe6d14 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 24 Jun 2024 12:13:26 -0500 Subject: [PATCH 41/56] 0.10.8 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e1e5f6a..8e44e88 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /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 diff --git a/sources b/sources index f14cafc..f4a95f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.7.tar.gz) = e85d648b9903f5c44a2748f5be410e510987618841744ceffd23ae826dc56cf411c5e7f07979597a050d703443c1540ef63ce709608a2078789233b660be4ea2 +SHA512 (endless-sky-0.10.8.tar.gz) = d6cfb3efba6214a42b112d315dda945085f6a9f915a22bd3fe0ff78cb628a242aa8c0613165a2e1c67d81f5c32f937c2b73a7851efe3984ebe94af4e456df547 From a207536537ee660bee6590f43259426444b4a305 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:03:08 +0000 Subject: [PATCH 42/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 0cef7fd..cc17f02 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -92,6 +92,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From 5327e26e7363213dbd0f85836a24a6f2d71ab66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 13:57:20 +0200 Subject: [PATCH 43/56] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- endless-sky.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/endless-sky.spec b/endless-sky.spec index cc17f02..04c3a89 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,9 +1,10 @@ Name: endless-sky Version: 0.10.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Space exploration, trading, and combat game -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: https://%{name}.github.io Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: endless-sky-wrapper @@ -92,6 +93,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From 3338022990d8d109fd6b06065fe6e26781fdcbc4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 30 Sep 2024 12:31:51 -0500 Subject: [PATCH 44/56] 0.10.9 --- .gitignore | 1 + endless-sky.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e44e88..8261c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 diff --git a/endless-sky.spec b/endless-sky.spec index 04c3a89..39b75b8 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.10.8 -Release: 3%{?dist} +Version: 0.10.9 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -28,6 +28,9 @@ BuildRequires: desktop-file-utils BuildRequires: libmad-devel BuildRequires: libuuid-devel BuildRequires: mesa-libGL-devel +BuildRequires: catch-devel +BuildRequires: libasan +BuildRequires: libubsan %description Explore other star systems. Earn money by trading, carrying passengers, or @@ -93,6 +96,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index f4a95f4..cc1fbc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.8.tar.gz) = d6cfb3efba6214a42b112d315dda945085f6a9f915a22bd3fe0ff78cb628a242aa8c0613165a2e1c67d81f5c32f937c2b73a7851efe3984ebe94af4e456df547 +SHA512 (endless-sky-0.10.9.tar.gz) = 8dcc0501b3502fdd7b8481f2d95c50a689b3b2deb4046a65b8cff764590d7d9be98b562e373ed0cb302b8711da771c7802037deb85d3ea81a31d2ad378f74239 From 060b357505e252b1d3fdb551938fb958937a6118 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 28 Oct 2024 10:23:55 -0500 Subject: [PATCH 45/56] 0.10.10 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8261c3f..02b5c10 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /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 diff --git a/endless-sky.spec b/endless-sky.spec index 39b75b8..28f234b 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.9 +Version: 0.10.10 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -96,6 +96,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index cc1fbc2..866b680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.9.tar.gz) = 8dcc0501b3502fdd7b8481f2d95c50a689b3b2deb4046a65b8cff764590d7d9be98b562e373ed0cb302b8711da771c7802037deb85d3ea81a31d2ad378f74239 +SHA512 (endless-sky-0.10.10.tar.gz) = 85fd33b6da11aa35ec27283a80b8f2308ebea237fe9b2941ea0046c7b57bf17bcc24a9893e83cf490a21f47595d32617a7225948ce34d38ba94a1dac9303c892 From c6aec9ce33ccf26608b509df9b83711660564190 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 17:00:20 +0000 Subject: [PATCH 46/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 28f234b..ca7e3f9 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -96,6 +96,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From fdc0f4c57b01f8aa1774844017983bc6931e23ec Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 27 Jan 2025 11:48:40 -0600 Subject: [PATCH 47/56] 0.10.11 --- .gitignore | 1 + 10952.patch | 61 ++++++++++++++++++++++ endless-sky-0.10.0-remove-games-path.patch | 26 ++++----- endless-sky.spec | 10 ++-- sources | 2 +- 5 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 10952.patch diff --git a/.gitignore b/.gitignore index 02b5c10..ab327e6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/10952.patch b/10952.patch new file mode 100644 index 0000000..1b2c318 --- /dev/null +++ b/10952.patch @@ -0,0 +1,61 @@ +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 b553f01..7d1a6e2 100644 --- a/endless-sky-0.10.0-remove-games-path.patch +++ b/endless-sky-0.10.0-remove-games-path.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt~ 2023-02-19 15:37:56.000000000 -0600 -+++ CMakeLists.txt 2023-02-21 15:25:06.378269708 -0600 +--- 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) @@ -17,14 +17,14 @@ 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) ---- 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)) +--- 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/"; + + 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 ca7e3f9..3fe87fb 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.10.10 -Release: 2%{?dist} +Version: 0.10.11 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -13,6 +13,7 @@ Source1: endless-sky-wrapper # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. Patch0: endless-sky-0.10.0-remove-games-path.patch +Patch1: 10952.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: cmake @@ -53,7 +54,7 @@ Images, sound, and game data for %{name}. %prep -%autosetup -p0 +%autosetup -p1 %build @@ -96,6 +97,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index 866b680..d60e279 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.10.tar.gz) = 85fd33b6da11aa35ec27283a80b8f2308ebea237fe9b2941ea0046c7b57bf17bcc24a9893e83cf490a21f47595d32617a7225948ce34d38ba94a1dac9303c892 +SHA512 (endless-sky-0.10.11.tar.gz) = c410f810848df754c23878dabe55a402e8c053592d40e7c638d426c5d4a3add618bb20e010211d952a082e21df0f1a7ce51bcf107db009bfb66dd689c906389b From 8e1df5ed50baea931bbbe8a44ece077dc355a9e1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 22 Feb 2025 20:16:57 -0600 Subject: [PATCH 48/56] 0.10.12 --- .gitignore | 1 + endless-sky.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab327e6..1685a71 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /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 diff --git a/endless-sky.spec b/endless-sky.spec index 3fe87fb..051d1f9 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.11 +Version: 0.10.12 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -13,7 +13,6 @@ Source1: endless-sky-wrapper # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. Patch0: endless-sky-0.10.0-remove-games-path.patch -Patch1: 10952.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: cmake @@ -97,6 +96,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index d60e279..4346f4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.11.tar.gz) = c410f810848df754c23878dabe55a402e8c053592d40e7c638d426c5d4a3add618bb20e010211d952a082e21df0f1a7ce51bcf107db009bfb66dd689c906389b +SHA512 (endless-sky-0.10.12.tar.gz) = 908751e4d0f6df5bfdfc0be99326a3a9e6ef4585e7968b4576c338c9b7904b462628ebec329b1246c7c2edec5a281f28ff389ae754ec92f11743cac5e20d260a From 9cbe845bb4380a3f824c1168e73c30a60164364f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Jun 2025 15:16:30 -0500 Subject: [PATCH 49/56] 0.10.13 --- endless-sky-0.10.0-remove-games-path.patch | 24 ++++++++++++---------- endless-sky.spec | 6 +++++- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/endless-sky-0.10.0-remove-games-path.patch b/endless-sky-0.10.0-remove-games-path.patch index 7d1a6e2..56fed28 100644 --- a/endless-sky-0.10.0-remove-games-path.patch +++ b/endless-sky-0.10.0-remove-games-path.patch @@ -1,30 +1,32 @@ ---- 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 @@ +--- 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 @@ 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-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/"; +--- 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/"; - const auto IsParent = [](const auto parent, const auto child) -> bool { - if(distance(child.begin(), child.end()) < distance(parent.begin(), parent.end())) + if(IsParent(LOCAL_PATH, resources)) + resources = LOCAL_PATH / RESOURCE_PATH; diff --git a/endless-sky.spec b/endless-sky.spec index 051d1f9..967cdb4 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.12 +Version: 0.10.13 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -31,6 +31,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: catch-devel BuildRequires: libasan BuildRequires: libubsan +BuildRequires: minizip-ng-compat-devel %description Explore other star systems. Earn money by trading, carrying passengers, or @@ -96,6 +97,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From 8506031eaf1f3e2746040aff9f736c08d3988ce6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Jun 2025 15:40:02 -0500 Subject: [PATCH 50/56] 0.10.13 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1685a71..2861c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /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 diff --git a/sources b/sources index 4346f4e..63a3df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.12.tar.gz) = 908751e4d0f6df5bfdfc0be99326a3a9e6ef4585e7968b4576c338c9b7904b462628ebec329b1246c7c2edec5a281f28ff389ae754ec92f11743cac5e20d260a +SHA512 (endless-sky-0.10.13.tar.gz) = 236115f0711fa5ce630a23c665bf13e246656ec9fa9698e0f27c3dc07fdd9774eea3a83d44e96c1ebed1edc27c8abe5ab9d9f8f045bdc2b831605e9d86ab9981 From 86cdaaa066354d01eef7b621a5285fb40bb26ab4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Jun 2025 09:35:03 -0500 Subject: [PATCH 51/56] 0.10.13.1 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2861c6d..7cedfd8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /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 diff --git a/endless-sky.spec b/endless-sky.spec index 967cdb4..e0b22bd 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.13 +Version: 0.10.13.1 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index 63a3df5..526e9a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.13.tar.gz) = 236115f0711fa5ce630a23c665bf13e246656ec9fa9698e0f27c3dc07fdd9774eea3a83d44e96c1ebed1edc27c8abe5ab9d9f8f045bdc2b831605e9d86ab9981 +SHA512 (endless-sky-0.10.13.1.tar.gz) = 48c12b4631d5613d7a08b3434bb681821d55dc9f6507a375913c93ec6101ca7e327bf09d7ecb246325dabed1a5cbc029eab569959aecaa703c094eb9a62f816f From 8d42251cf1da37499bed4685bb6a5b227f3b947e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 3 Jul 2025 12:14:43 -0500 Subject: [PATCH 52/56] 0.10.14 --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index e0b22bd..2654a85 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.13.1 +Version: 0.10.14 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From b370f5493d31596415c54f41d1dd392637c2ec9e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 3 Jul 2025 12:29:28 -0500 Subject: [PATCH 53/56] 0.10.14 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7cedfd8..4487c39 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /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 diff --git a/sources b/sources index 526e9a3..a1bad71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.13.1.tar.gz) = 48c12b4631d5613d7a08b3434bb681821d55dc9f6507a375913c93ec6101ca7e327bf09d7ecb246325dabed1a5cbc029eab569959aecaa703c094eb9a62f816f +SHA512 (endless-sky-0.10.14.tar.gz) = 28b2fcc599aa827809ab62c7bd1bfdd76e417b347c9114f7be1444c088fd484ce498eb35d27c2b87ed887c48380352e0da4bf9a4c74a209d86bb9bd404b64445 From 9af92297cd46f4f7cd1c35e8328fcb3d82786ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:53:59 +0000 Subject: [PATCH 54/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- endless-sky.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/endless-sky.spec b/endless-sky.spec index 2654a85..c30117c 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky Version: 0.10.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Space exploration, trading, and combat game # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 From 68c937589afa978f560653b3007ecb060c753368 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Oct 2025 07:57:37 -0500 Subject: [PATCH 55/56] 0.10.15 --- .gitignore | 1 + endless-sky.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4487c39..70ffdcd 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /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 diff --git a/endless-sky.spec b/endless-sky.spec index c30117c..37072d8 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,6 +1,6 @@ Name: endless-sky -Version: 0.10.14 -Release: 2%{?dist} +Version: 0.10.15 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -32,6 +32,10 @@ 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 @@ -97,6 +101,9 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt %changelog +* 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 diff --git a/sources b/sources index a1bad71..6d19cd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.14.tar.gz) = 28b2fcc599aa827809ab62c7bd1bfdd76e417b347c9114f7be1444c088fd484ce498eb35d27c2b87ed887c48380352e0da4bf9a4c74a209d86bb9bd404b64445 +SHA512 (endless-sky-0.10.15.tar.gz) = 3213ede6b5e0267f092d7c62924401d5ff1343a0088a91dc8ffcf233a226341b211b6ad80edacc83cf57ae22478e13bd53fedd716fb7fea1ed9e5aaf77ab835f From 61bcb6072985630e1768f9afab51b4379f832838 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 27 Oct 2025 11:01:14 -0500 Subject: [PATCH 56/56] 0.10.16 --- .gitignore | 1 + endless-sky.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 70ffdcd..268bc9f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /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.spec b/endless-sky.spec index 37072d8..0653c5b 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,5 +1,5 @@ Name: endless-sky -Version: 0.10.15 +Version: 0.10.16 Release: 1%{?dist} Summary: Space exploration, trading, and combat game @@ -101,6 +101,9 @@ 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 diff --git a/sources b/sources index 6d19cd3..b186ba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.10.15.tar.gz) = 3213ede6b5e0267f092d7c62924401d5ff1343a0088a91dc8ffcf233a226341b211b6ad80edacc83cf57ae22478e13bd53fedd716fb7fea1ed9e5aaf77ab835f +SHA512 (endless-sky-0.10.16.tar.gz) = 8dd8ee8bdb71ceda23024ac07502adab4f246ed3723fdc49d152de1796ba799c8584d31892f357034fa9c7d93c2880278f05cde9c0bd7e7e789eabb0513ba4ca