# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1522619504 -7200
# Node ID 142a0c92607c2e84eb617d1ecfe2f3821595b401
# Parent  d61b64679bb416b80edd5e41fddae77b93a50088# Parent  5ba4fbb8bed7322d6be141de19471ddc2e103b8e
merge latest from 59.x

diff -r 5ba4fbb8bed7 -r 142a0c92607c MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Apr 01 21:58:37 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Apr 01 23:51:44 2018 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sun Apr  1 20:02:44 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 60.0b8
+- requires NSPR 4.19 and NSS 3.36
+
+-------------------------------------------------------------------
 Tue Mar 27 14:07:11 UTC 2018 - schwab@suse.de
 
 - Reduce constraints on aarch64
diff -r 5ba4fbb8bed7 -r 142a0c92607c MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Apr 01 21:58:37 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Apr 01 23:51:44 2018 +0200
@@ -19,8 +19,8 @@
 
 # changed with every update
 %define major 59
-%define mainver %major.0.2
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 %define branding 1
 %define releasedate 20180323154952
 
@@ -70,11 +70,11 @@
 BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
-BuildRequires:  mozilla-nspr-devel >= 4.18
-BuildRequires:  mozilla-nss-devel >= 3.35
+BuildRequires:  mozilla-nspr-devel >= 4.19
+BuildRequires:  mozilla-nss-devel >= 3.36
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
-BuildRequires:  rust >= 1.22.1
+BuildRequires:  rust >= 1.24
 BuildRequires:  rust-std
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
diff -r 5ba4fbb8bed7 -r 142a0c92607c MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sun Apr 01 21:58:37 2018 +0200
+++ b/MozillaFirefox/create-tar.sh	Sun Apr 01 23:51:44 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_59_0_2_RELEASE"
-VERSION="59.0.2"
+RELEASE_TAG="FIREFOX_60_0b8_RELEASE"
+VERSION="59.99"
 
 # check required tools
 test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 )