From 9cc685b7a8b2a04d2f287bff6851b7f39ddf6c52 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 20 May 2025 19:21:39 +0000 Subject: [PATCH] import CS firefox-128.10.1-1.el9 --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SPECS/firefox.spec | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 6b0da91..941ed9a 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz -11fa2914eeacd6f489a0cd232d9d7197e89f8df0 SOURCES/firefox-128.10.0esr.processed-source.tar.xz -0b5a3c7e89424e37ad84c57377342782b06f5dfb SOURCES/firefox-langpacks-128.10.0esr-20250422.tar.xz +88659f9d1ca1c4b3d2c41b7c02f22c67937b5595 SOURCES/firefox-128.10.1esr.processed-source.tar.xz +cbabfc1ddd62bfd8561c746c15e9b721b97567c8 SOURCES/firefox-langpacks-128.10.1esr-20250519.tar.xz 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm diff --git a/.gitignore b/.gitignore index d98210b..c5a66c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-128.10.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-128.10.0esr-20250422.tar.xz +SOURCES/firefox-128.10.1esr.processed-source.tar.xz +SOURCES/firefox-langpacks-128.10.1esr-20250519.tar.xz SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 22ccb27..4386d7a 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -118,7 +118,7 @@ end} %if 0%{?rhel} > 7 && 0%{?rhel} < 10 %global use_gcc_ts 1 - %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6 + %if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) # clang depends on gcc-toolset-14-gcc-c++ %global gts_version 14 %else @@ -166,7 +166,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.10.0 +Version: 128.10.1 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -197,7 +197,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}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20250422.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250519.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -483,8 +483,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime BuildRequires: gcc-toolset-%{gts_version}-binutils BuildRequires: gcc-toolset-%{gts_version}-gcc BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin -# Do not explicitly require gcc-toolset-%{gts_version}-gcc-g++ instead fail +# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail # when clang is upgraded to depend on a later toolset and adjust version. +# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version. %endif Requires: mozilla-filesystem @@ -1988,6 +1989,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon May 19 2025 Eike Rathke - 128.10.1-1 +- Update to 128.10.1 + * Tue Apr 22 2025 Eike Rathke - 128.10.0-1 - Update to 128.10.0 build1