diff options
| author | Martin Stransky <stransky@redhat.com> | 2021-01-05 10:41:15 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2021-01-05 10:41:15 +0100 |
| commit | 3f23832808ad7f1fd88a59b9c2edb4122b509f99 (patch) | |
| tree | abcac84d161561ffdcaed0b4019c24f42cc3dcf4 | |
| parent | Merge branch 'master' into f33 (diff) | |
| parent | merge (diff) | |
| download | librewolf-fedora-ff-3f23832808ad7f1fd88a59b9c2edb4122b509f99.tar.gz librewolf-fedora-ff-3f23832808ad7f1fd88a59b9c2edb4122b509f99.tar.bz2 librewolf-fedora-ff-3f23832808ad7f1fd88a59b9c2edb4122b509f99.zip | |
:x
| -rw-r--r-- | firefox.spec | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index f5fa80b..b98ac6f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -131,7 +131,7 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox Version: 84.0.1 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?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 @@ -313,6 +313,7 @@ BuildRequires: fdk-aac-free-devel BuildRequires: nss-tools BuildRequires: python2.7 %endif +BuildRequires: make Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -712,6 +713,14 @@ xvfb-run ./mach build 2>&1 | cat - make -C objdir buildsymbols %endif +# Don't provide/require bundled libs +%filter_provides_in %{mozappdir}/ +%filter_requires_in %{mozappdir}/ +%filter_provides_in %{mozappdir}/gmp-clearkey/0.1/ +%filter_requires_in %{mozappdir}/gmp-clearkey/0.1/ +%filter_provides_in %{mozappdir}/gtk2 +%filter_requires_in %{mozappdir}/gtk2 + # run Firefox test suite %if 0%{?run_firefox_tests} mkdir -p objdir/_virtualenvs/init_py3 @@ -1002,6 +1011,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jan 05 2021 Jan Horak <jhorak@redhat.com> - 84.0.1-5 +- Removing requires/provides of the bundled libraries + * Mon Jan 4 2021 Martin Stransky <stransky@redhat.com> - 84.0.1-4 - Enabled tests |