[netpanzer] Build with $RPM_OPT_FLAGS (#580241).

[Ville Skyttä]

commit 347e9043f6989ed2212ad8b05e356becba5fee70
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Feb 28 22:02:52 2011 +0200

    Build with $RPM_OPT_FLAGS (#580241).

 netpanzer-0.8.3-optflags-580241.patch |   20 ++++++++++++++++++++
 netpanzer.spec                        |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/netpanzer-0.8.3-optflags-580241.patch b/netpanzer-0.8.3-optflags-580241.patch
new file mode 100644
index 0000000..58ef605
--- /dev/null
+++ b/netpanzer-0.8.3-optflags-580241.patch
@@ -0,0 +1,20 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=580241
+
+diff -up netpanzer-0.8.3/SConstruct~ netpanzer-0.8.3/SConstruct
+--- netpanzer-0.8.3/SConstruct~	2011-02-27 23:15:50.809212605 +0200
++++ netpanzer-0.8.3/SConstruct	2011-02-27 23:31:51.462430916 +0200
+@@ -141,11 +141,11 @@ if env['mode'] == 'debug':
+     crosslinuxenv.Append(CCFLAGS = ['-g', '-O0'])
+     crosslinuxenv['FINALEXENAME'] = crosslinuxenv['FINALBUILDDIR'] + 'netpanzer-debug'
+ else:
+-    env.Append(CCFLAGS = ['-O2','-s'])
++    env.Append(CCFLAGS = env['ENV']['RPM_OPT_FLAGS'].split())
+     env['FINALEXENAME'] = 'netpanzer'
+-    crossmingwenv.Append(CCFLAGS = ['-O2','-s'])
++    crossmingwenv.Append(CCFLAGS = env['ENV']['RPM_OPT_FLAGS'].split())
+     crossmingwenv['FINALEXENAME'] = crossmingwenv['FINALBUILDDIR'] + 'netpanzer'
+-    crosslinuxenv.Append(CCFLAGS = ['-O2','-s'])
++    crosslinuxenv.Append(CCFLAGS = env['ENV']['RPM_OPT_FLAGS'].split())
+     crosslinuxenv['FINALEXENAME'] = crosslinuxenv['FINALBUILDDIR'] + 'netpanzer'
+ 
+ env.Append(CCFLAGS = ['-Wall'])
diff --git a/netpanzer.spec b/netpanzer.spec
index 9fdf50d..1de7eaf 100644
--- a/netpanzer.spec
+++ b/netpanzer.spec
@@ -1,6 +1,6 @@
 Name:           netpanzer
 Version:        0.8.3.svn612010
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An Online Multiplayer Tactical Warfare Game
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@ Patch0:         netpanzer-desktop.patch
 #Patch3:         netpanzer-0.8.2-Log-algorithm.patch
 Patch4:         netpanzer-0.8.2-MapSelectionView-memory.patch
 Patch5:         netpanzer-0.8.3-scons-fixes.patch
+Patch6:         netpanzer-0.8.3-optflags-580241.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  physfs-devel >= 0.1.9, desktop-file-utils, doxygen, scons
@@ -47,6 +48,7 @@ sed -i 's/\r//' RELNOTES
 #%patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p1
 
 %build
 scons datadir=%{_datadir}/netpanzer %{?_smp_mflags}
@@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpanzer
 
 %changelog
+* Mon Feb 28 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.8.3.svn612010-4
+- Build with $RPM_OPT_FLAGS (#580241).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3.svn612010-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild