# HG changeset patch # User Wolfgang Rosenauer # Date 1518179287 -3600 # Node ID 4b419fce88dc1e5d483a441c551c2751367c8416 # Parent d14085eee2b2f40a3ab5e26331eec08495512f36# Parent cd02d400c081b7618a5a1b0c3d5cd07a82e62a89 merge from firefox58 and prepare for 59.0b8 diff -r cd02d400c081 -r 4b419fce88dc MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Fri Feb 09 13:20:55 2018 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Fri Feb 09 13:28:07 2018 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 9 12:23:34 UTC 2018 - wr@rosenauer.org + +- update to Firefox 59.0b8 +- requires NSPR 4.18 and NSS 3.35 +- requires rust >= 1.22.1 + +------------------------------------------------------------------- Fri Feb 9 12:06:31 UTC 2018 - wr@rosenauer.org - correct requires and provides handling (boo#1076907) diff -r cd02d400c081 -r 4b419fce88dc MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Fri Feb 09 13:20:55 2018 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Fri Feb 09 13:28:07 2018 +0100 @@ -19,10 +19,10 @@ # changed with every update %define major 58 -%define mainver %major.0.1 -%define update_channel release +%define mainver %major.99 +%define update_channel beta %define branding 1 -%define releasedate 20180128191252 +%define releasedate 20180208193705 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -70,11 +70,11 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.17 -BuildRequires: mozilla-nss-devel >= 3.34.1 +BuildRequires: mozilla-nspr-devel >= 4.18 +BuildRequires: mozilla-nss-devel >= 3.35 BuildRequires: python-devel BuildRequires: python2-xml -BuildRequires: rust >= 1.21 +BuildRequires: rust >= 1.22.1 BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip diff -r cd02d400c081 -r 4b419fce88dc MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Fri Feb 09 13:20:55 2018 +0100 +++ b/MozillaFirefox/create-tar.sh Fri Feb 09 13:28:07 2018 +0100 @@ -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_58_0_1_RELEASE" -VERSION="58.0.1" +RELEASE_TAG="73ef186ad51ac2c4fc27b1f149fcc94355fe7dc6" +VERSION="58.99" # mozilla if [ -d mozilla ]; then