Merge branch 'main' into f34

This commit is contained in:
Martin Stransky 2021-03-10 09:19:58 +01:00
commit a1c75d68cf

View File

@ -40,6 +40,12 @@ ExcludeArch: s390x
ExcludeArch: armv7hl ExcludeArch: armv7hl
%endif %endif
# Temporary disable due to
# https://bugzilla.redhat.com/show_bug.cgi?id=1933742
%if 0%{?fedora} > 34
ExcludeArch: ppc64le
%endif
# Temporary disable tests on Rawhide/arm/i686 due to failures # Temporary disable tests on Rawhide/arm/i686 due to failures
%if 0%{?fedora} > 33 %if 0%{?fedora} > 33
%ifarch armv7hl %ifarch armv7hl
@ -177,7 +183,7 @@ ExcludeArch: armv7hl
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 86.0 Version: 86.0
Release: 7%{?pre_tag}%{?dist} Release: 8%{?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
@ -1087,6 +1093,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed Mar 10 2021 Martin Stransky <stransky@redhat.com> - 86.0-8
- Temporary disable ppc64le/Fedora 35 due to
https://bugzilla.redhat.com/show_bug.cgi?id=1933742
* Wed Mar 3 2021 Martin Stransky <stransky@redhat.com> - 86.0-7 * Wed Mar 3 2021 Martin Stransky <stransky@redhat.com> - 86.0-7
- Added fix for mozbz#1694670 - Added fix for mozbz#1694670