diff --git a/.firefox.metadata b/.firefox.metadata index 50d7875..c9acb6f 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz -e7ed7ac1b931b5fa222caef5f168fadddb86b324 SOURCES/firefox-128.6.0esr.processed-source.tar.xz -798d35ab0e2ca81a9978c0514684f3d7fce0e384 SOURCES/firefox-langpacks-128.6.0esr-20241218.tar.xz +97f80fbec07b2663ff64cffffd2fc12543781f4c SOURCES/firefox-128.7.0esr.processed-source.tar.xz +0af301b251597ca9645b7ba620731d24ec8d0d87 SOURCES/firefox-langpacks-128.7.0esr-20250129.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 8fb8497..a59329d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-128.6.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-128.6.0esr-20241218.tar.xz +SOURCES/firefox-128.7.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-128.7.0esr-20250129.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 2171a87..4564a97 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -117,7 +117,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 @@ -160,7 +166,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.6.0 +Version: 128.7.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -191,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}-20241218.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250129.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -469,10 +475,12 @@ 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-%{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. %endif Requires: mozilla-filesystem @@ -1465,7 +1473,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} @@ -1975,6 +1983,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* 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