# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1347384429 -7200
# Node ID b1134fe91f9ab5b6a588789e8ad4eb785d0f82a8
# Parent  4812378b5646bb58ddf3ad2c7443c95159725c33# Parent  875fd6d221765ce18128cb12be183492c5819369
merge latest changes from firefox16

diff -r 875fd6d22176 -r b1134fe91f9a MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Sep 11 11:30:21 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Sep 11 19:27:09 2012 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 11 09:55:36 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 17 (20120910)
+
 -------------------------------------------------------------------
 Tue Sep 11 06:16:38 UTC 2012 - wr@rosenauer.org
 
diff -r 875fd6d22176 -r b1134fe91f9a MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Sep 11 11:30:21 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Sep 11 19:27:09 2012 +0200
@@ -17,9 +17,9 @@
 #
 
 
-%define major 15
-%define mainver %major.99
-%define update_channel beta
+%define major 16
+%define mainver %major.98
+%define update_channel aurora
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012090400
+%define         releasedate 2012091000
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -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 875fd6d22176 -r b1134fe91f9a MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Sep 11 11:30:21 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Tue Sep 11 19:27:09 2012 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_16_0b2_RELEASE"
-VERSION="15.99"
+RELEASE_TAG="default"
+VERSION="16.98"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 875fd6d22176 -r b1134fe91f9a xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Tue Sep 11 11:30:21 2012 +0200
+++ b/xulrunner/create-tar.sh	Tue Sep 11 19:27:09 2012 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_16_0b2_RELEASE"
-VERSION="15.99"
+RELEASE_TAG="default"
+VERSION="16.98"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 875fd6d22176 -r b1134fe91f9a xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Tue Sep 11 11:30:21 2012 +0200
+++ b/xulrunner/xulrunner.spec	Tue Sep 11 19:27:09 2012 +0200
@@ -44,12 +44,12 @@
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.9.2
 BuildRequires:  mozilla-nss-devel >= 3.13.6
-Version:        15.99
+Version:        16.98
 Release:        0
-%define         releasedate 2012082800
-%define         version_internal 16.0
-%define         apiversion 16
-%define         uaweight 1600000
+%define         releasedate 2012091000
+%define         version_internal 17.0
+%define         apiversion 17
+%define         uaweight 1700000
 Summary:        Mozilla Runtime Environment
 License:        MPL-2.0
 Group:          Productivity/Other