From d76650a4e380a35dadafaf5c76aeffe7f3775cf2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 21 2022 12:38:23 +0000 Subject: import firefox-102.5.0-1.el8_7 --- diff --git a/.firefox.metadata b/.firefox.metadata index 46a55fa..62f2f5e 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz -cd92cc1af9b71503bc3f495f80bd1731ba8c64b2 SOURCES/firefox-102.4.0esr.processed-source.tar.xz -22af4a12cac3c237e75c8bbe76b71103320f850c SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz +c0e4d44aee25bed036ad1f534bbd53a395f77f3c SOURCES/firefox-102.5.0esr.processed-source.tar.xz +cd8dfecbe2062065caf994fba339d87e95342068 SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index bc104a3..a84f1f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-102.4.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz +SOURCES/firefox-102.5.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-6.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/SOURCES/build-rhel7-lower-node-min-version.patch b/SOURCES/build-rhel7-lower-node-min-version.patch new file mode 100644 index 0000000..477847e --- /dev/null +++ b/SOURCES/build-rhel7-lower-node-min-version.patch @@ -0,0 +1,11 @@ +--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200 ++++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200 +@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir + from mozfile import which + from six import PY3 + +-NODE_MIN_VERSION = StrictVersion("10.24.1") ++NODE_MIN_VERSION = StrictVersion("10.24.0") + NPM_MIN_VERSION = StrictVersion("6.14.12") + + diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 90c9fb2..a60529b 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -200,7 +200,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.4.0 +Version: 102.5.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -225,7 +225,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20221012.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20221109.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -272,6 +272,7 @@ Patch73: build-ascii-decode-fail-rhel7.patch Patch75: build-big-endian-errors.patch Patch76: firefox-nss-version.patch Patch77: mozilla-1775202.patch +Patch78: build-rhel7-lower-node-min-version.patch # Test patches @@ -636,6 +637,9 @@ echo "use_rustts %{?use_rustts}" %patch77 -p1 -b .mozilla-1775202 %patch73 -p1 -b .build-ascii-decode-fail-rhel7 +%if 0%{?rhel} == 7 +%patch78 -p1 -b .build-rhel7-lower-node-min-version +%endif # Test patches %patch102 -p1 -b .firefox-tests-xpcshell-freeze @@ -1421,8 +1425,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Oct 20 2022 CentOS Sources - 102.4.0-1.el8.centos -- Apply debranding changes +* Wed Nov 09 2022 Eike Rathke - 102.5.0-1 +- Update to 102.5.0 build1 * Wed Oct 12 2022 Eike Rathke - 102.4.0-1 - Update to 102.4.0 build1