Compare commits
No commits in common. "rawhide" and "f34" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -4,7 +4,3 @@
|
||||
/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
|
||||
/endless-sky-0.9.16.tar.gz
|
||||
/endless-sky-0.9.16.1.tar.gz
|
||||
/endless-sky-0.10.0.tar.gz
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- source/Preferences.h
|
||||
+++ source/Preferences.h
|
||||
@@ -17,6 +17,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
#define PREFERENCES_H_
|
||||
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
@ -1,30 +0,0 @@
|
||||
--- 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))
|
||||
41
endless-sky-0.9.13-remove-games-path.patch
Normal file
41
endless-sky-0.9.13-remove-games-path.patch
Normal file
@ -0,0 +1,41 @@
|
||||
--- 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))
|
||||
19
endless-sky-0.9.14-remove-additional-ccflags.patch
Normal file
19
endless-sky-0.9.14-remove-additional-ccflags.patch
Normal file
@ -0,0 +1,19 @@
|
||||
--- 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", "-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)
|
||||
|
||||
# Always use `ar` to create the symbol table, and don't use ranlib at all, since it fails to preserve
|
||||
@ -1,22 +1,24 @@
|
||||
%define gittag0 v0.9.14
|
||||
|
||||
Name: endless-sky
|
||||
Version: 0.10.0
|
||||
Version: 0.9.14
|
||||
Release: 1%{?dist}
|
||||
Summary: Space exploration, trading, and combat game
|
||||
|
||||
License: GPLv3
|
||||
URL: https://%{name}.github.io
|
||||
Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: endless-sky-wrapper
|
||||
Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{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.
|
||||
# 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
|
||||
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
|
||||
|
||||
Requires: %{name}-data = %{version}-%{release}
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: scons
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: SDL2-devel
|
||||
BuildRequires: openal-soft-devel
|
||||
@ -26,8 +28,6 @@ BuildRequires: libjpeg-turbo-devel
|
||||
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
|
||||
@ -54,25 +54,35 @@ Images, sound, and game data for %{name}.
|
||||
|
||||
|
||||
%build
|
||||
%cmake -DES_USE_VCPKG=OFF
|
||||
%cmake_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}
|
||||
|
||||
%check
|
||||
appstream-util validate-relax --nonet io.github.endless_sky.endless_sky.appdata.xml
|
||||
appstream-util validate-relax --nonet %{name}.appdata.xml
|
||||
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
|
||||
CXXFLAGS="%{optflags}" \
|
||||
LDFLAGS="%{?__global_ldflags}" \
|
||||
/usr/bin/scons \
|
||||
%{?_smp_mflags} \
|
||||
PREFIX=%{_prefix} \
|
||||
DESTDIR=%{buildroot} \
|
||||
install
|
||||
install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.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}
|
||||
rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt
|
||||
|
||||
%files
|
||||
%doc README.md changelog copyright
|
||||
%doc README.md
|
||||
%license license.txt
|
||||
%{_bindir}/%{name}*
|
||||
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
|
||||
@ -84,8 +94,7 @@ 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
|
||||
%{_datadir}/appdata/%{name}.appdata.xml
|
||||
%{_mandir}/man6/%{name}.6.gz
|
||||
|
||||
|
||||
@ -95,33 +104,6 @@ rm -f %{buildroot}%{_datadir}/doc/endless-sky/license.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 21 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.10.0-1
|
||||
- 0.10.0
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Oct 19 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.9.16.1-1
|
||||
- 0.9.16.1
|
||||
|
||||
* Mon Oct 17 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.9.16-1
|
||||
- 0.9.16
|
||||
|
||||
* Tue Oct 04 2022 Link Dupont <linkdupont@fedoraproject.org> - 0.9.15-1
|
||||
- 0.9.15
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.9.14-4
|
||||
- Rebuild for glew 2.2
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jul 12 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.9.14-1
|
||||
- 0.9.14
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (endless-sky-0.10.0.tar.gz) = a9e5f42832c439e31c56447434032d12f16383ecbe52b87b64ddd3623c6a9564ae23b56b94f4edf354c119726039270ac97cb54088b03e772947618379e462f8
|
||||
SHA512 (endless-sky-0.9.14.tar.gz) = 861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user