Merge branch 'master' into f31

This commit is contained in:
Martin Stransky 2019-10-31 23:41:37 +01:00
commit dec9b22207

View File

@ -10,7 +10,7 @@ ExcludeArch: s390x
ExcludeArch: ppc64le ExcludeArch: ppc64le
%endif %endif
%global system_nss 1 %global system_nss 0
%global system_ffi 1 %global system_ffi 1
# libvpx is too new for Firefox 65 # libvpx is too new for Firefox 65
%if 0%{?fedora} < 30 %if 0%{?fedora} < 30
@ -94,7 +94,7 @@ ExcludeArch: ppc64le
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 70.0 Version: 70.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ 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 Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -949,6 +949,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Oct 31 2019 Martin Stransky <stransky@redhat.com> - 70.0-2
- Switched to in-tree nss due to rhbz#1752303
* Tue Oct 15 2019 Martin Stransky <stransky@redhat.com> - 70.0-1 * Tue Oct 15 2019 Martin Stransky <stransky@redhat.com> - 70.0-1
- Updated to 70.0 - Updated to 70.0