From a3db0931c3d36ff5783dfe3051b354efc7939c01 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 18 2022 00:12:46 +0000 Subject: import firefox-91.9.0-1.el9_0 --- diff --git a/.firefox.metadata b/.firefox.metadata index 9d09d7b..1863b73 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz -a42cb494b90ea92c186e1912c8c5f64bad365633 SOURCES/firefox-91.8.0esr.processed-source.tar.xz -0ec5e6f571ac5aa2ac4cefc5a18ddecf01395dde SOURCES/firefox-langpacks-91.8.0esr-20220405.tar.xz +0d960c32727bbe7dd0b752a3d2165f429f4144b3 SOURCES/firefox-91.9.0esr.processed-source.tar.xz +584306ac938eedb9e3ad93e5d23481b63478bbaf SOURCES/firefox-langpacks-91.9.0esr-20220426.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 6af5206..10cd3a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-91.8.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-91.8.0esr-20220405.tar.xz +SOURCES/firefox-91.9.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-91.9.0esr-20220426.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 e2c8bba..012ee10 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -18,7 +18,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el8") if match then - return 6 + return 7 end return -1 end} @@ -128,7 +128,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.8.0 +Version: 91.9.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -153,7 +153,7 @@ ExcludeArch: aarch64 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}-20220405.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220426.tar.xz %endif Source2: cbindgen-vendor.tar.xz @@ -435,11 +435,7 @@ echo "use_rustts %{?use_rustts}" %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 +%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 6) || 0%{?rhel} >= 9 %patch225 -p1 -b .firefox-nss-addon-hack %endif @@ -1268,8 +1264,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue May 17 2022 CentOS Sources - 91.8.0-1.el9.centos -- Apply debranding changes +* Tue Apr 26 2022 Eike Rathke - 91.9.0-1 +- Update to 91.9.0 * Tue Apr 05 2022 Eike Rathke - 91.8.0-1 - Update to 91.8.0