diff --git a/download b/download index 3c3c6eee15bdf17f95c033aca142de551f4a6cd2..e60a5d9d3003cdca5a0c1e8da9191a3abf42ea83 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz -6f4af13e4500dd7463c4c98043e001c0 firefox-128.6.0esr.processed-source.tar.xz -f4739cb849286a315dc4075553697ec3 firefox-langpacks-128.6.0esr-20241218.tar.xz +90f4f777a738c96d0efbcd7bb03c526e firefox-128.7.0esr.processed-source.tar.xz +de619e2868444395795c069006ab5357 firefox-langpacks-128.7.0esr-20250129.tar.xz b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz 2d901c7a62fc68bbd8816e8c4c6276c1 wasi-sdk-20.tar.gz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm diff --git a/firefox.spec b/firefox.spec index bc1e3d6abe5fc0338398fcd86e6cff1b1573be59..01433bab8bcf53f7d056ec7be6947af9fc0d42cd 100644 --- a/firefox.spec +++ b/firefox.spec @@ -118,7 +118,13 @@ end} %global nodejs_build_req nodejs %if 0%{?rhel} > 7 && 0%{?rhel} < 10 -%global use_gcc_ts 1 + %global use_gcc_ts 1 + %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6 + # clang depends on gcc-toolset-14-gcc-c++ + %global gts_version 14 + %else + %global gts_version 13 + %endif %endif %if 0%{?rhel} == 7 @@ -161,7 +167,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.6.0 +Version: 128.7.0 Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -194,7 +200,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}-20241218.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250129.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -472,11 +478,13 @@ BuildRequires: xorg-x11-server-Xvfb %endif %if 0%{?use_gcc_ts} -BuildRequires: gcc-toolset-13-runtime -BuildRequires: gcc-toolset-13-binutils -BuildRequires: gcc-toolset-13-gcc -BuildRequires: gcc-toolset-13-gcc-plugin-annobin -BuildRequires: gcc-toolset-13-gcc-c++ +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 +# when clang is upgraded to depend on a later toolset and adjust version. +BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ %endif Requires: mozilla-filesystem @@ -1469,7 +1477,7 @@ function install_rpms_to_current_dir() { # Enable toolsets set +e %if 0%{?use_gcc_ts} -source scl_source enable gcc-toolset-13 +source scl_source enable gcc-toolset-%{gts_version} %endif %if 0%{?use_dts} source scl_source enable devtoolset-%{dts_version} @@ -1979,11 +1987,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Jan 10 2025 Liwei Ge - 128.6.0-1.0.1 +* Wed Feb 12 2025 Liwei Ge - 128.7.0-1.0.1 - Add firefox-anolis-default-prefs.js - Remove bookmarks and loongarch64 - Add BuildRequires gcc-toolset-13-gcc-c++ +* Tue Jan 28 2025 Eike Rathke - 128.7.0-1 +- Update to 128.7.0 build1 + * Wed Dec 18 2024 Eike Rathke - 128.6.0-1 - Update to 128.6.0 build1