summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--firefox.spec20
-rw-r--r--sources4
3 files changed, 18 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index b5d71d3..16d3883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -439,3 +439,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-84.0.source.tar.xz
/firefox-langpacks-84.0-20201210.tar.xz
/firefox-langpacks-84.0-20201214.tar.xz
+/firefox-84.0.1.source.tar.xz
+/firefox-langpacks-84.0.1-20201222.tar.xz
diff --git a/firefox.spec b/firefox.spec
index b2338e0..86cb1e2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -3,7 +3,7 @@
%global debug_build 0
%global build_with_clang 0
%global build_with_asan 0
-%global run_firefox_tests 1
+%global run_firefox_tests 0
%global test_offscreen 1
%global test_on_wayland 0
%global create_debuginfo 1
@@ -132,15 +132,18 @@ ExcludeArch: s390x
%global pre_tag .debug
%endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=1908791
+%global __provides_exclude_from ^%{mozappdir}
+
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 84.0
-Release: 7%{?pre_tag}%{?dist}
+Version: 84.0.1
+Release: 1%{?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
%if %{with langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20201214.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20201222.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source10: firefox-mozconfig
@@ -678,6 +681,7 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16
[ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24
[ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32
+[ "$RPM_BUILD_NCPUS" -ge 64 ] && MOZ_SMP_FLAGS=-j64
%endif
echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
@@ -1003,8 +1007,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Thu Dec 17 2020 Martin Stransky <stransky@redhat.com> - 84.0-7
-- Enabled tests
+* Tue Dec 22 2020 Martin Stransky <stransky@redhat.com> - 84.0.1-1
+- Updated to 84.0.1
+
+* Sun Dec 20 2020 Miro HronĨok <mhroncok@redhat.com> - 84.0-7
+- Filter out private libraries provides
+- Fixes: rhbz#1908791
* Thu Dec 17 2020 Martin Stransky <stransky@redhat.com> - 84.0-6
- Disable PGO on Rawhide due to build issues
diff --git a/sources b/sources
index edab5d4..ab1cbc0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cbindgen-vendor.tar.xz) = 3c925c5523246b7dfbcb4ce563483d5b45315a06dc90f2cf07cddef0c263dd15b410afbbe4d86594de96a308e93be3b27ffec01f5f759a42ecba3cc983b1677f
SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9
-SHA512 (firefox-84.0.source.tar.xz) = 6ad94617ee7b30c23c94dc5a0e0a5aded0022a91b7cbe393284659227e3a5e2390ce4438a459e9789291fa6ace787429388ce715ae1f758446b3c2e682c1d2ce
-SHA512 (firefox-langpacks-84.0-20201214.tar.xz) = 139ce8f3f62740bbb6ec912c5cca1e086991bf1a6d887ed25e00a44f7a291b9cb269b32a2d1fc28297d4df9ff45c7099dbb414924fa9cd8f53f969d4c23d39ef
+SHA512 (firefox-84.0.1.source.tar.xz) = e5fc2f4aa8cff2f34dcfae83c040ab0ffc23194840d1b00944c5293849f82be48c638112dec55f158002f2c6b6cc626a11a06ab55b0c327b29fba3bc078e4435
+SHA512 (firefox-langpacks-84.0.1-20201222.tar.xz) = 57cbf9cce363e81b5a14eb95c59a0012b949924a04ea903afcfe4dfe9148470820986c41d81fa93a7cbe1cd20d658dfb7798bbb34f4ce39fd14fd821623d3667
bgstack15