# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1362862346 -3600
# Node ID 72f6f8dbdb4f18132f20eacf2dcbc46d08ec4192
# Parent  49dc6da2c835e25a1302a0654359859cbb1f0602# Parent  f454588ac85b0d17fb520673eb7c3673df8b2223
merge latest changes from firefox20

diff -r f454588ac85b -r 72f6f8dbdb4f MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Mar 09 21:48:06 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Mar 09 21:52:26 2013 +0100
@@ -17,9 +17,9 @@
 #
 
 
-%define major 19
-%define mainver %major.99
-%define update_channel beta
+%define major 20
+%define mainver %major.98
+%define update_channel aurora
 
 %if %suse_version > 1220
 %define gstreamer_ver 1.0
@@ -50,8 +50,8 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.5
-BuildRequires:  mozilla-nss-devel >= 3.14.2
+BuildRequires:  mozilla-nspr-devel >= 4.9.6
+BuildRequires:  mozilla-nss-devel >= 3.14.3
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
@@ -138,7 +138,7 @@
 %define desktop_file_name %{name}
 %endif
 ### build options
-%define branding 1
+%define branding 0
 %define localize 1
 %ifarch ppc ppc64 s390 s390x ia64 %arm
 %define crashreporter 0
diff -r f454588ac85b -r 72f6f8dbdb4f MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sat Mar 09 21:48:06 2013 +0100
+++ b/MozillaFirefox/create-tar.sh	Sat Mar 09 21:52:26 2013 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_20_0b4_RELEASE"
-VERSION="19.99"
+RELEASE_TAG="default"
+VERSION="20.98"
 
 # mozilla
 echo "cloning $BRANCH..."