From 827afe368346cc5ff93e9c842d026a101acfb541 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 00:31:16 +0000 Subject: Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- firefox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/firefox.spec b/firefox.spec index 3e403c2..75270c3 100644 --- a/firefox.spec +++ b/firefox.spec @@ -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 -- cgit From 442afe94ba93892db3e77c17f5c1c548690d319e Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 5 Jan 2021 09:52:24 +0100 Subject: Removing requires/provides of the bundled libraries --- firefox.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index be4f885..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 @@ -713,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 @@ -1003,6 +1011,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jan 05 2021 Jan Horak - 84.0.1-5 +- Removing requires/provides of the bundled libraries + * Mon Jan 4 2021 Martin Stransky - 84.0.1-4 - Enabled tests -- cgit From 9a75dee4c8d0c8c9f643c79a62fe463af9797820 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 5 Jan 2021 10:35:27 +0100 Subject: Release up --- firefox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index be4f885..8b07bab 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 @@ -1003,7 +1003,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Jan 4 2021 Martin Stransky - 84.0.1-4 +* Mon Jan 4 2021 Martin Stransky - 84.0.1-5 - Enabled tests * Mon Jan 4 2021 Martin Stransky - 84.0.1-3 -- cgit