[icecat] Fixed compiler flags.

[Antonio Trande]

commit 47206676b5feb41bd864e0ebfdf8af4ea531c94c
Author: sagitter <anto.trande at gmail.com>
Date:   Wed Oct 22 12:39:40 2014 +0200

    Fixed compiler flags.

 icecat-mozconfig-common |    4 ++--
 icecat.spec             |   18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index 2d04f8a..fce6a8c 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -21,12 +21,12 @@ ac_add_options --disable-jsd
 ac_add_options --disable-gczeal
 ac_add_options --disable-js-diagnostics
 ac_add_options --with-system-icu
-ac_add_options  --without-intl-api
+ac_add_options --without-intl-api
 ac_add_options --disable-ipdl-tests
 ac_add_options --disable-accessibility
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
-ac_add_options --disable-elf-hack
+ac_add_options --enable-elf-hack
 ac_add_options --disable-official-branding
 ac_add_options --enable-system-cairo 
 ac_add_options --disable-tests
diff --git a/icecat.spec b/icecat.spec
index 5eef46c..10969ff 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -11,7 +11,7 @@
 
 Name:    icecat
 Version: 31.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: GNU version of Firefox browser
 Group:   Applications/Internet
 
@@ -210,17 +210,18 @@ echo "ac_add_options --enable-png-arm-neon-support=check" >> mozconfig-common
 
 %build
 ##
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wall//')
+MOZ_OPT_CXXFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wall//')
+MOZ_OPT_CFLAGS="$RPM_OPT_FLAGS"
+
 #rhbz#1037063
 # -Werror=format-security causes build failures when -Wno-format is explicitly given
 # for some sources
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
 
-%ifarch aarch64
+%ifarch %{arm} aarch64
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
-export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS=$MOZ_OPT_FLAGS
+export CFLAGS="$MOZ_OPT_CFLAGS -Wformat-security -Wformat -Werror=format-security"
+export CXXFLAGS="$MOZ_OPT_CXXFLAGS -Wformat-security -Wformat -Werror=format-security"
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 mkdir -p %{name}-objdir && cd %{name}-objdir
@@ -229,7 +230,7 @@ mkdir -p %{name}-objdir && cd %{name}-objdir
  --includedir=%{_includedir} \
  --datadir=%{_datadir} \
  --mandir=%{_mandir} \
- --enable-optimize="$MOZ_OPT_FLAGS -fPIC"\
+ --enable-optimize="-fPIC"\
  --with-system-nspr \
  --with-system-nss \
  --with-system-nspr-prefix=%{_bindir} \
@@ -354,6 +355,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{icecat_ver}.desk
 %{_includedir}/%{icecat_ver}/
 
 %changelog
+* Wed Oct 22 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-2
+- Fixed compiler flags
+
 * Tue Oct 21 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-1
 - Update to 31.2.0
 - Added 'configure' options