[fife] Fix for gcc 4.7

[Bruno Wolff III]

commit d38ca24123a550e37732af9bf49add1379ef4b7a
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jan 30 22:05:58 2012 -0600

    Fix for gcc 4.7
    
    -Wl was being used incorrectly. Rather than having two patches that
    change the same two lines, I adjusted the boost patch to remove -Wl
    at the same time as adding -lboost_filesystem.

 fife-0.3.1-boost.patch |    4 ++--
 fife.spec              |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/fife-0.3.1-boost.patch b/fife-0.3.1-boost.patch
index c6c08b9..0960cf3 100644
--- a/fife-0.3.1-boost.patch
+++ b/fife-0.3.1-boost.patch
@@ -6,7 +6,7 @@ diff -ur orig/SConstruct mod/SConstruct
  		
  	env.AppendUnique(CXXFLAGS=['-g', '-D_DEBUG'])
 -	env.AppendUnique(LINKFLAGS=['-Wl'])
-+	env.AppendUnique(LINKFLAGS=['-Wl', '-lboost_filesystem'])
++	env.AppendUnique(LINKFLAGS=['-lboost_filesystem'])
  	engine_var_dir = os.path.join('build','engine','debug')
  	tests_var_dir = os.path.join('build','tests','debug')
  	print "Building DEBUG binaries..."
@@ -15,7 +15,7 @@ diff -ur orig/SConstruct mod/SConstruct
  		env.AppendUnique(CXXFLAGS=['-O2', '-Wall', '-Wno-unused'])
  	
 -	env.AppendUnique(LINKFLAGS=['-Wl'])
-+	env.AppendUnique(LINKFLAGS=['-Wl', '-lboost_filesystem'])
++	env.AppendUnique(LINKFLAGS=['-lboost_filesystem'])
  	engine_var_dir = os.path.join('build','engine','release')
  	tests_var_dir = os.path.join('build','tests','release')
  	print "Building RELEASE binaries..."
diff --git a/fife.spec b/fife.spec
index c548424..0b23d9f 100644
--- a/fife.spec
+++ b/fife.spec
@@ -5,7 +5,7 @@
 Name:           fife
 Epoch:          2
 Version:        0.3.2
-Release:        10.%{minor_version}%{?dist}
+Release:        11.%{minor_version}%{?dist}
 Summary:        Cross platform game creation framework
 
 Group:          Amusements/Games
@@ -210,6 +210,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 20 2012 Bruno Wolff III <bruno at wolff.to> - 1:0.3.2-11.r2
+- Fix for gcc 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.3.2-10.r2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild