[thunderbird-lightning/el5] Need -march=i686; Cleanup duplicate .mozconfig lines

[Orion Poplawski]

commit ae5f8f14fd945947293a44d945f01db5ec5d20aa
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Dec 16 13:14:30 2013 -0700

    Need -march=i686; Cleanup duplicate .mozconfig lines

 thunderbird-lightning.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 63180cf..b04f471 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -163,11 +163,6 @@ cd ..
 echo "ac_add_options --disable-system-hunspell" >> .mozconfig
 echo "ac_add_options --disable-libnotify" >> .mozconfig
 echo "ac_add_options --disable-methodjit" >> .mozconfig
-
-# RHEL 5 mozconfig changes:
-echo "ac_add_options --disable-system-hunspell" >> .mozconfig
-echo "ac_add_options --disable-libnotify" >> .mozconfig
-echo "ac_add_options --disable-methodjit" >> .mozconfig
 echo "ac_add_options --disable-skia" >> .mozconfig
 
 # Disable webm
@@ -209,6 +204,11 @@ MOZ_APP_DIR=%{mozappdir}
 # 
 MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
                       %{__sed} -e 's/-Wall//')
+%ifarch %{ix86}
+# i386 target is missing sync_bool_compare_and_swap/sync_add_and_fetch
+# gcc build-in functions
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-march=i386/-march=i686/')
+%endif
 export CC=gcc44
 export GCC=gcc44
 export CXX=g++44