From 5629e9b198913b8a142cdd26f2d0688365b91091 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Feb 2022 12:38:21 -0500 Subject: [PATCH 1/2] import firefox-91.5.0-1.el9 --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SPECS/firefox.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 19f80b6..49d14a0 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz -322e0ffb8b442f599b0f5dd695e6f83050b3dc82 SOURCES/firefox-91.4.0esr.processed-source.tar.xz -74a1b8c9a5f4a96f80af2d3fe542495e3af2423a SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz +7a15042e733a831ee519372eef5b50fdc0becdde SOURCES/firefox-91.5.0esr.processed-source.tar.xz +4a72e79ba3d0861cad3e229ef54e66014f65447b SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index e79811e..1c80fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-91.4.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz +SOURCES/firefox-91.5.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 956d73f..7effe6f 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -128,8 +128,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.4.0 -Release: 3%{?dist} +Version: 91.5.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -149,7 +149,7 @@ ExcludeArch: s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220106.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1249,6 +1249,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Jan 06 2022 Eike Rathke - 91.5.0-1 +- Update to 91.5.0 build1 + * Wed Dec 22 2021 Jan Horak - 91.4.0-3 - Enable optimalization on s390x From f23038e86da754cfc3bbfa2c2bc7ef01b5be7ab3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Mar 2022 05:46:39 -0500 Subject: [PATCH 2/2] import firefox-91.6.0-2.el9 --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SOURCES/firefox-mozconfig | 1 - SPECS/firefox.spec | 32 +++++++++++++++++++++++++++----- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 49d14a0..9cc981b 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz -7a15042e733a831ee519372eef5b50fdc0becdde SOURCES/firefox-91.5.0esr.processed-source.tar.xz -4a72e79ba3d0861cad3e229ef54e66014f65447b SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz +986181f538d2a6951f95b4e1a754854b8e0048ff SOURCES/firefox-91.6.0esr.processed-source.tar.xz +ea7fce0f4ee0101b6d9ef8b4d050fe8a16becff9 SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index 1c80fd7..6475423 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-91.5.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz +SOURCES/firefox-91.6.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/SOURCES/firefox-mozconfig b/SOURCES/firefox-mozconfig index 9e8a32f..6c7afd7 100644 --- a/SOURCES/firefox-mozconfig +++ b/SOURCES/firefox-mozconfig @@ -12,7 +12,6 @@ ac_add_options --enable-chrome-format=omni ac_add_options --enable-pulseaudio ac_add_options --without-system-icu ac_add_options --enable-release -ac_add_options --update-channel=release ac_add_options --allow-addon-sideload ac_add_options --with-system-jpeg ac_add_options --enable-js-shell diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 7effe6f..36e613e 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -128,18 +128,22 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.5.0 -Release: 1%{?dist} +Version: 91.6.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + %if %{rhel_minor_version} == 1 +ExcludeArch: %{ix86} aarch64 s390x + %else ExcludeArch: %{ix86} + %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -149,7 +153,7 @@ ExcludeArch: s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220106.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220202.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -425,7 +429,15 @@ echo "use_rustts %{?use_rustts}" %patch215 -p1 -b .addons %patch219 -p1 -b .rhbz-1173156 %patch224 -p1 -b .1170092 + +# the nss changed in 8.6 and later, so addons are working in older releases +%if 0%{?rhel_minor_version} >= 6 %patch225 -p1 -b .firefox-nss-addon-hack +%endif + +%if 0%{?rhel} >= 9 +%patch225 -p1 -b .firefox-nss-addon-hack +%endif # Patch for big endian platforms only %if 0%{?big_endian} @@ -645,7 +657,7 @@ function build_bundled_package() { echo $PKG_CONFIG_PATH rpm -ivh %{SOURCE403} - rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/nss.spec + rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec pushd %{_buildrootdir} #cleanup #rm -rf {_buildrootdir}/usr/lib/debug/* @@ -1249,6 +1261,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Feb 09 2022 Jan Horak - 91.6.0-2 +- Enable addon installation on rhel9 + +* Wed Feb 02 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 + +* Wed Feb 02 2022 Jan Horak - 91.5.0-2 +- Use default update channel to fix non working enterprise policies: + rhbz#2044667 + * Thu Jan 06 2022 Eike Rathke - 91.5.0-1 - Update to 91.5.0 build1