[xulrunner] Fix up optimize flags

[Christopher Aillon]

commit fb5ad6bfeced2ead1e944523977a4bd1504da064
Author: Christopher Aillon <caillon at redhat.com>
Date:   Tue Jan 25 08:54:52 2011 -0800

    Fix up optimize flags
    
    Don't pass the opt flags twice to moz, as that will just cause them
    to be duplicated in the compile lines.
    
    Also, only need to execute sed once.

 xulrunner-mozconfig |    2 +-
 xulrunner.spec      |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index 0a3d18e..e27a116 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -18,7 +18,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="$MOZ_OPT_FLAGS"
+ac_add_options --enable-optimize
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-pango
diff --git a/xulrunner.spec b/xulrunner.spec
index 1df6212..e63bdfa 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -203,7 +203,8 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 # Mozilla builds with -Wall with exception of a few warnings which show up
 # everywhere in the code; so, don't override that.
 # and disable C++ exceptions
-export MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//' | %{__sed} -e 's/-fexceptions/-fno-exceptions/g')
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \
+                     %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS