# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1528489559 -7200
# Node ID 893fc4d031d6e0ab455392faf6b62c12abdac8a6
# Parent  75893a3d8fbe5a419769f159e172224b11004ad6# Parent  7a49806c8dae00b55c96fa96022f701b69efffb9
merge firefox60 for next beta cycle

diff -r 7a49806c8dae -r 893fc4d031d6 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 22:09:15 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 22:25:59 2018 +0200
@@ -19,10 +19,10 @@
 
 # changed with every update
 %define major 60
-%define mainver %major.0.2
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 %define branding 1
-%define releasedate 20180605171542
+%define releasedate 20180607135512
 %define source_prefix firefox-%{mainver}
 
 # PIE, full relro (x86_64 for now)
@@ -73,7 +73,7 @@
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.19
-BuildRequires:  mozilla-nss-devel >= 3.36.4
+BuildRequires:  mozilla-nss-devel >= 3.37.3
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
 BuildRequires:  rust >= 1.24
diff -r 7a49806c8dae -r 893fc4d031d6 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri Jun 08 22:09:15 2018 +0200
+++ b/MozillaFirefox/create-tar.sh	Fri Jun 08 22:25:59 2018 +0200
@@ -5,10 +5,10 @@
 # "moz_source_stamp": "c1de04f39fa956cfce83f6065b0e709369215ed5"
 # http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/l10n_changesets.txt
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_60_0_2_RELEASE"
-VERSION="60.0.2"
+RELEASE_TAG="FIREFOX_61_0b12_RELEASE"
+VERSION="60.99"
 
 # check required tools
 test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 )