From d60ec2c12bf8520a602c54c7f23411ef850e0dc7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 01 2022 20:17:19 +0000 Subject: import firefox-91.5.0-1.module+el8.5.0+13838+cf13d4f4 --- 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/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 1637ae6..e8c36cf 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -128,7 +128,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.4.0 +Version: 91.5.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -136,10 +136,14 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ 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}-20211201.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220106.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1247,8 +1251,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Dec 20 2021 CentOS Sources - 91.4.0-1.el8.centos -- Apply debranding changes +* Thu Jan 06 2022 Eike Rathke - 91.5.0-1 +- Update to 91.5.0 build1 * Wed Dec 01 2021 Eike Rathke - 91.4.0-1 - Update to 91.4.0 build1