# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1363681104 -3600
# Node ID 0dd4ede5105c87ff93c43d2950ecfe7e0279951d
# Parent  3fbce5dd16c2470aaa6fac5f6e710463c8b819de# Parent  026f47fed3a00f11ca967532effe8069abaaf0c3
merge constraints from firefox20

diff -r 026f47fed3a0 -r 0dd4ede5105c MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Mar 19 09:17:51 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Mar 19 09:18:24 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,7 +50,7 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.5
+BuildRequires:  mozilla-nspr-devel >= 4.9.6
 BuildRequires:  mozilla-nss-devel >= 3.14.3
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
@@ -60,7 +60,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013031500
+%define         releasedate 2013031900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -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 026f47fed3a0 -r 0dd4ede5105c MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Mar 19 09:17:51 2013 +0100
+++ b/MozillaFirefox/create-tar.sh	Tue Mar 19 09:18:24 2013 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_20_0b5_RELEASE"
-VERSION="19.99"
+RELEASE_TAG="default"
+VERSION="20.98"
 
 # mozilla
 echo "cloning $BRANCH..."