# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1413487222 -7200
# Node ID 9483ff78d5a059064c880dc6b0dfce6563949e8b
# Parent  f61bd1cd52c22742c6090def5219d8287f7c22c0# Parent  f1c5ccf4d1a73d374bc90970d06971e86db7ac46
merge from firefox33
preparation for Firefox 34

diff -r f1c5ccf4d1a7 -r 9483ff78d5a0 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Oct 16 19:29:34 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Oct 16 21:20:22 2014 +0200
@@ -18,8 +18,8 @@
 
 
 %define major 33
-%define mainver %major.0
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 
 %if %suse_version > 1210
 %if %suse_version > 1310
@@ -55,7 +55,7 @@
 BuildRequires:  wireless-tools
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.10.7
-BuildRequires:  mozilla-nss-devel >= 3.17.1
+BuildRequires:  mozilla-nss-devel >= 3.17.2
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pkgconfig(libpulse)
 %if %suse_version > 1210
@@ -74,7 +74,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014101000
+%define         releasedate 2014101500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r f1c5ccf4d1a7 -r 9483ff78d5a0 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Thu Oct 16 19:29:34 2014 +0200
+++ b/MozillaFirefox/create-tar.sh	Thu Oct 16 21:20:22 2014 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_33_0_RELEASE"
-VERSION="33.0"
+RELEASE_TAG="FIREFOX_34_0b1_RELEASE"
+VERSION="33.99"
 
 # mozilla
 if [ -d mozilla ]; then