diff --git a/.gitignore b/.gitignore index eb72886..17b2d93 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm SOURCES/nss-3.101.0-7.el9_2.src.rpm -SOURCES/thunderbird-128.9.2esr.processed-source.tar.xz -SOURCES/thunderbird-langpacks-128.9.2esr-20250416.tar.xz +SOURCES/thunderbird-128.10.0esr.processed-source.tar.xz +SOURCES/thunderbird-langpacks-128.10.0esr-20250428.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 3e2a231..1c7bf1c 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -2,5 +2,5 @@ d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm 0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm -04750755e303eeb56eed41a9a31bdab359973f5d SOURCES/thunderbird-128.9.2esr.processed-source.tar.xz -3d02dadbaeb5e79cd69b4a6160440378d3b84402 SOURCES/thunderbird-langpacks-128.9.2esr-20250416.tar.xz +c32d35afb300a89e0c702e1db5e923565f5c3989 SOURCES/thunderbird-128.10.0esr.processed-source.tar.xz +9ad46c67f8e7458fac79ce6003a0b582fe606136 SOURCES/thunderbird-langpacks-128.10.0esr-20250428.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index e86c9c4..56b49ad 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el9") if match then - return 6 + return 7 end match = string.match(str, ".el10_%d+") if match then @@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el10") if match then - return 0 + return 1 end return -1 end} @@ -88,7 +88,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 @@ -137,7 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.9.2 +Version: 128.10.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +165,7 @@ ExcludeArch: %{ix86} #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250416.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250428.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -333,8 +333,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 %if %{?use_openssl_for_librnp} @@ -1658,6 +1659,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Apr 28 2025 Eike Rathke - 128.10.0-1 +- Update to 128.10.0 build1 + * Wed Apr 16 2025 Eike Rathke - 128.9.2-1 - Update to 128.9.2