From e9152819c0e608e3114cb664e9c165b060019fca Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 30 Sep 2019 10:03:48 -0500
Subject: [PATCH] 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 <gwync@protonmail.com> - 0.9.10-1
+- 0.9.10
+- Environment patch upstreamed.
+
 * Wed Aug 21 2019 Gwyn Ciesla <gwync@protonmail.com> - 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