Merge branch 'master' into f26

3 files changed, 11 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 2675786..c6c5efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,3 +272,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-57.0.1-20171130.tar.xz
 /firefox-57.0.3.source.tar.xz
 /firefox-langpacks-57.0.3-20180102.tar.xz
+/firefox-57.0.4.source.tar.xz
+/firefox-langpacks-57.0.4-20180104.tar.xz
diff --git a/firefox.spec b/firefox.spec
index f33a659..b803375 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -70,7 +70,7 @@ ExcludeArch: armv7hl
 # we're building against could bring us some broken dependencies from time to time.
 #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.33
+%global nss_version 3.34
 #%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global nss_build_version %{nss_version}
 %endif
@@ -98,13 +98,13 @@ ExcludeArch: armv7hl
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        57.0.3
+Version:        57.0.4
 Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20180102.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20180104.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source12:       firefox-redhat-default-prefs.js
@@ -858,6 +858,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jan 4 2018 Martin Stransky <stransky@redhat.com> - 57.0.4-1
+- Update to 57.0.4
+- Require nss 3.34 (rhbz#1531031)
+
 * Tue Jan  2 2018 Jan Horak <jhorak@redhat.com> - 57.0.3-1
 - Exclude armv7hl due to OOM during build on koji
 - Update to 57.0.3
diff --git a/sources b/sources
index 2283d68..c832d3a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (firefox-57.0.3.source.tar.xz) = 1f887ab6bb16ef69bce56b689e761b3e09fc106b4bee7842be2c8e7eac05981f9922e9c3a8bd22b4935545cbbc10bf0a0c79df7800cd3c80fd4137070c9bfd09
-SHA512 (firefox-langpacks-57.0.3-20180102.tar.xz) = 8422976c309840a18e5f3b69a47a42c00b99032df97c4851cf04c2d4d04af0924caf93e8df00d52fae912f362eb31263231536b9cbe18c1238c191e017416953
+SHA512 (firefox-57.0.4.source.tar.xz) = 58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0
+SHA512 (firefox-langpacks-57.0.4-20180104.tar.xz) = 361b652a0089c4437e8e135f6499b93b875e6c4b6d24118e07e3a8c287f1f045855fb8de36af57baf8ff84f319a0eeba285f50a3ced27bf6c20093ed95f303d0