From 869f775e6b556ba174b83914483d7ed793b1f27d Mon Sep 17 00:00:00 2001
From: Link Dupont
Date: Sat, 31 Dec 2016 21:54:32 -0800
Subject: [PATCH] Set CXXFLAGS and LDFLAGS in both %build and %install.
---
endless-sky.spec | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/endless-sky.spec b/endless-sky.spec
index de4e524..fc4f19e 100644
--- a/endless-sky.spec
+++ b/endless-sky.spec
@@ -2,7 +2,7 @@
Name: endless-sky
Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Space exploration, trading, and combat game
License: GPLv3
@@ -53,8 +53,12 @@ Images, sound, and game data for %{name}.
%build
-CCFLAGS="%{optflags}" scons PREFIX=%{_prefix}
-
+CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
+LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
+%{_bindir}/scons \
+ %{?_smp_mflags} \
+ PREFIX=%{_prefix} \
+ DESTDIR=%{buildroot}
%check
appstream-util validate-relax --nonet %{name}.appdata.xml
@@ -62,7 +66,13 @@ desktop-file-validate %{name}.desktop
%install
-scons PREFIX=%{_prefix} DESTDIR=%{buildroot} install
+CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
+LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
+%{_bindir}/scons \
+ %{?_smp_mflags} \
+ PREFIX=%{_prefix} \
+ DESTDIR=%{buildroot} \
+ install
install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -100,6 +110,9 @@ fi
%changelog
+* Sat Dec 31 2016 Link Dupont - 0.9.4-3
+- Build and install with identical CXXFLAGS (RH#1402807)
+
* Thu Dec 8 2016 Link Dupont - 0.9.4-2
- Build with $RPM_OPT_FLAGS (#1402807)