Merge branch 'master' into f31

3 files changed, 12 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 7077731..165f434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -368,3 +368,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-69.0.3-20191010.tar.xz
 /firefox-70.0.source.tar.xz
 /firefox-langpacks-70.0-20191018.tar.xz
+/firefox-70.0.1.source.tar.xz
+/firefox-langpacks-70.0.1-20191101.tar.xz
diff --git a/firefox.spec b/firefox.spec
index dd7bab4..dfbb3c5 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@ ExcludeArch: s390x
 ExcludeArch: ppc64le
 %endif
 
-%global system_nss        0
+%global system_nss        1
 %global system_ffi        1
 # libvpx is too new for Firefox 65
 %if 0%{?fedora} < 30
@@ -93,13 +93,13 @@ ExcludeArch: ppc64le
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        70.0
-Release:        2%{?pre_tag}%{?dist}
+Version:        70.0.1
+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 %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20191018.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20191101.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -949,6 +949,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Nov 1 2019 Martin Stransky <stransky@redhat.com> - 70.0.1-1
+- Updated to 70.0.1
+- Built with system-nss (reverted 70.0-2 change).
+
 * Thu Oct 31 2019 Martin Stransky <stransky@redhat.com> - 70.0-2
 - Switched to in-tree nss due to rhbz#1752303
 
diff --git a/sources b/sources
index 23e2fcc..1708286 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 88afa0bc6af525cbb46bc75578b90419b28b95b396d5002fbf299a78a173681b840096ff83ef6e48553d1a5e0aa04e79383ab4d09bf431f3b864fcbacc7de46d
-SHA512 (firefox-70.0.source.tar.xz) = c2643d88d59012dfd762357d66005c8892dec066b0ae9d8d33a29ea4427d1e5ae4a0376725c7d960c0025d5c9567eca816eb612b4ea987069e455c06fc442973
-SHA512 (firefox-langpacks-70.0-20191018.tar.xz) = aa17651aa8d4bc82d014846db559df9e896c329d58acfc145433480ad60cebf5a0a3774958e452d76b3f78bb70545e27208dbe226cfa13fc0a42c65ddfd48d46
+SHA512 (firefox-70.0.1.source.tar.xz) = 798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725
+SHA512 (firefox-langpacks-70.0.1-20191101.tar.xz) = 307c9d14980ad66b5cfd1ad6a0bd2f4f60d09d9ea9478876b9537c31ae713b5cbe05410b8c01822084aa669f58d017a15ba4f7c6bcbcb07f144437658da72ff4