# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1339132140 -7200
# Node ID 916711b0f1d698dfe11125eceea3dc96b32a8f33
# Parent  0c2249d015b6364bd123547a2eda4b5f136ff03c# Parent  2d86bdb4277fb5f0980956aa87f83952d7815e1b
merge latest 14.0 changes to Aurora 15.0

diff -r 2d86bdb4277f -r 916711b0f1d6 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Jun 08 06:54:39 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Jun 08 07:09:00 2012 +0200
@@ -1,8 +1,7 @@
 -------------------------------------------------------------------
-Fri Jun  8 04:52:39 UTC 2012 - wr@rosenauer.org
-
-- update to 14.0b6 (20120605)
-- license change from tri license to MPL-2.0
+Fri Jun  8 05:06:31 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 15 (20120608)
 
 -------------------------------------------------------------------
 Sat Jun  2 08:22:51 UTC 2012 - wr@rosenauer.org
diff -r 2d86bdb4277f -r 916711b0f1d6 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 06:54:39 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 07:09:00 2012 +0200
@@ -17,9 +17,9 @@
 #
 
 
-%define major 13
-%define mainver %major.99
-%define update_channel beta
+%define major 14
+%define mainver %major.98
+%define update_channel aurora
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -44,8 +44,8 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.0
-BuildRequires:  mozilla-nss-devel >= 3.13.4
+BuildRequires:  mozilla-nspr-devel >= 4.9.1
+BuildRequires:  mozilla-nss-devel >= 3.13.5
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
 BuildRequires:  pkgconfig(gstreamer-0.10)
@@ -125,7 +125,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 2d86bdb4277f -r 916711b0f1d6 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri Jun 08 06:54:39 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Fri Jun 08 07:09:00 2012 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_14_0b6_RELEASE"
-VERSION="13.99"
+RELEASE_TAG="default"
+VERSION="14.98"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 2d86bdb4277f -r 916711b0f1d6 xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Fri Jun 08 06:54:39 2012 +0200
+++ b/xulrunner/create-tar.sh	Fri Jun 08 07:09:00 2012 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_14_0b6_RELEASE"
-VERSION="13.99"
+RELEASE_TAG="default"
+VERSION="14.98"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
diff -r 2d86bdb4277f -r 916711b0f1d6 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Fri Jun 08 06:54:39 2012 +0200
+++ b/xulrunner/xulrunner.spec	Fri Jun 08 07:09:00 2012 +0200
@@ -42,14 +42,14 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.0
-BuildRequires:  mozilla-nss-devel >= 3.13.4
-Version:        13.99
+BuildRequires:  mozilla-nspr-devel >= 4.9.1
+BuildRequires:  mozilla-nss-devel >= 3.13.5
+Version:        14.98
 Release:        0
-%define         releasedate 2012060500
-%define         version_internal 14.0
-%define         apiversion 14
-%define         uaweight 1400000
+%define         releasedate 2012060800
+%define         version_internal 15.0
+%define         apiversion 15
+%define         uaweight 1500000
 Summary:        Mozilla Runtime Environment
 License:        MPL-2.0
 Group:          Productivity/Other