# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1363677623 -3600
# Node ID 3fbce5dd16c2470aaa6fac5f6e710463c8b819de
# Parent  72f6f8dbdb4f18132f20eacf2dcbc46d08ec4192# Parent  7c6f56a37ed654e135b6b4bff2a9905ed9f2ef3a
merge from firefox20

diff -r 72f6f8dbdb4f -r 3fbce5dd16c2 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Mar 09 21:52:26 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Mar 19 08:20:23 2013 +0100
@@ -1,8 +1,16 @@
 -------------------------------------------------------------------
-Sat Mar  9 10:20:56 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 20.0b4
+Fri Mar 15 23:09:22 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 20.0b5
 - use GStreamer 1.0 starting with 12.3 (mozilla-gstreamer-1.patch)
+- require NSS 3.14.3
+
+-------------------------------------------------------------------
+Tue Mar 12 23:08:15 UTC 2013 - dmueller@suse.com
+
+- build fixes for armv7hl:
+  * disable debug build as armv7hl does not have enough memory
+  * disable webrtc on armv7hl as it is non-compiling
 
 -------------------------------------------------------------------
 Thu Mar  7 19:03:32 UTC 2013 - wr@rosenauer.org
diff -r 72f6f8dbdb4f -r 3fbce5dd16c2 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Mar 09 21:52:26 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Mar 19 08:20:23 2013 +0100
@@ -60,7 +60,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013030800
+%define         releasedate 2013031900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -274,6 +274,9 @@
 export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
+%ifarch %arm
+export CFLAGS="${CFLAGS/-g/}"
+%endif
 %ifarch ppc64
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
@@ -334,6 +337,7 @@
 %ifarch %arm
 cat << EOF >> $MOZCONFIG
 ac_add_options --disable-neon
+ac_add_options --disable-webrtc
 EOF
 %endif
 make -f client.mk build
diff -r 72f6f8dbdb4f -r 3fbce5dd16c2 MozillaFirefox/create-tar.sh