From b6333b626abbccb677ca11fa03df5b2faedbe533 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 26 May 2025 16:21:37 +0000 Subject: [PATCH] import CS firefox-128.10.1-1.el10 --- .gitignore | 4 ++-- firefox.spec | 14 +++++++++----- sources | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e6f8c45..c0b6f86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ cbindgen-vendor.tar.xz -firefox-128.10.0esr.processed-source.tar.xz -firefox-langpacks-128.10.0esr-20250422.tar.xz +firefox-128.10.1esr.processed-source.tar.xz +firefox-langpacks-128.10.1esr-20250519.tar.xz mochitest-python.tar.gz nspr-4.35.0-1.el8_1.src.rpm nss-3.101.0-7.el8_2.src.rpm diff --git a/firefox.spec b/firefox.spec index c57f462..4386d7a 100644 --- a/firefox.spec +++ b/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 @@ -2015,7 +2019,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Nov 18 2024 Jan Grulich - 128.4.0-1 - Update to 128.4.0 build1 diff --git a/sources b/sources index eaf5362..9015a2d 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68 -SHA512 (firefox-128.10.0esr.processed-source.tar.xz) = a44794d30d45cb15585231c4f02c1a8b42ace6e65560ee051b215a0629a0a246c7905f401261d246d8e6e223f65058053f55e8e8ba3564e55625f30dbdc25dfb -SHA512 (firefox-langpacks-128.10.0esr-20250422.tar.xz) = 2467ad252527d4ec8e180b1ecf655cc7b9eb52b63c730265115e3d367fefd3b521b96869ec2f7ee7c96e0f988f80a61497b90ee3acb336cf22b3f1583c9cd874 +SHA512 (firefox-128.10.1esr.processed-source.tar.xz) = 5032c6bce82428fc31e153ed9ec775156b9074c87a6a34b78d1850ff6517c93f05548eb76e39475de858e1fab061382d0ca5a6ecbd0face045d775acd5f65178 +SHA512 (firefox-langpacks-128.10.1esr-20250519.tar.xz) = 5677006bc2258a9c422b641d8538c8be5ae97b1b5eee50417f281063370834baf4ab01f7212c4c7b4b1d1920976ae9e90d4783c9c872b80d066ce49853e065fe SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36 SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d