# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1313186200 -7200
# Node ID 9672e7276009f096e217df96ec6ae78812976ddc
# Parent  8adc6a9b5141d5f0f41a38ca592127d483cf2039
update to 6.0

diff -r 8adc6a9b5141 -r 9672e7276009 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Aug 05 13:38:05 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Aug 12 23:56:40 2011 +0200
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Fri Aug  5 07:07:25 UTC 2011 - wr@rosenauer.org
-
-- update to 6.0b5
+Fri Aug 12 21:16:19 UTC 2011 - wr@rosenauer.org
+
+- update to 6.0 (bnc#711954)
+  * included security fixes
 
 -------------------------------------------------------------------
 Fri Jul 22 13:34:12 UTC 2011 - wr@rosenauer.org
diff -r 8adc6a9b5141 -r 9672e7276009 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Aug 05 13:38:05 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Aug 12 23:56:40 2011 +0200
@@ -18,8 +18,8 @@
 
 # norootforbuild
 
-%define major 5
-%define mainver %major.99
+%define major 6
+%define mainver %major.0
 
 Name:           MozillaFirefox
 BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip fdupes Mesa-devel yasm
@@ -35,7 +35,7 @@
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
 Release:        1
-%define         releasedate 2011080400
+%define         releasedate 2011081200
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -270,7 +270,7 @@
 ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=default
 EOF
 %if %suse_version > 1130
 cat << EOF >> $MOZCONFIG
diff -r 8adc6a9b5141 -r 9672e7276009 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri Aug 05 13:38:05 2011 +0200
+++ b/MozillaFirefox/create-tar.sh	Fri Aug 12 23:56:40 2011 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-BRANCH="releases/mozilla-beta"
-RELEASE_TAG="FIREFOX_6_0b5_RELEASE"
-VERSION="5.99"
+BRANCH="releases/mozilla-release"
+RELEASE_TAG="FIREFOX_6_0_RELEASE"
+VERSION="6.0"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
@@ -23,7 +23,7 @@
     ja-JP-mac|en-US)
       ;;
     *)
-      hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale l10n/$locale
+      hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
       ;;
   esac