Merge branch 'master' into f31

firefox.spec

@@ -10,7 +10,7 @@ ExcludeArch: s390x
 ExcludeArch: ppc64le
 %endif
 
-%global system_nss        1
+%global system_nss        0
 %global system_ffi        1
 # libvpx is too new for Firefox 65
 %if 0%{?fedora} < 30
@@ -94,7 +94,7 @@ ExcludeArch: ppc64le
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        70.0.1
-Release:        4%{?pre_tag}%{?dist}
+Release:        5.nss%{?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
@@ -951,6 +951,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Nov 19 2019 Martin Stransky <stransky@redhat.com> - 70.0.1-5.nss
+- Built with in-tree nss (rhbz#1752303).
+
 * Mon Nov 04 2019 Jan Horak <jhorak@redhat.com> - 70.0.1-4
 - Added fix for non-scrollable popups