From e940df00ea0a80d98d61e0f87d32df4d1624a9cc Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 8 May 2025 12:15:43 +0000
Subject: [PATCH] Import from CS git

---
 .gitignore             |  4 ++--
 .thunderbird.metadata  |  4 ++--
 SPECS/thunderbird.spec | 16 ++++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 555b535..eb72886 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.0esr.b3.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-128.9.0esr-20250331.tar.xz
+SOURCES/thunderbird-128.9.2esr.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-128.9.2esr-20250416.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 625d3be..3e2a231 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
-b4f7526d7baa396cc2192e8be5398820f1d82f5c SOURCES/thunderbird-128.9.0esr.b3.processed-source.tar.xz
-dce65d96b9f450834dc390691f46c4f3cbf31dff SOURCES/thunderbird-langpacks-128.9.0esr-20250331.tar.xz
+04750755e303eeb56eed41a9a31bdab359973f5d SOURCES/thunderbird-128.9.2esr.processed-source.tar.xz
+3d02dadbaeb5e79cd69b4a6160440378d3b84402 SOURCES/thunderbird-langpacks-128.9.2esr-20250416.tar.xz
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index d8394c2..650ebe8 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -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
@@ -127,7 +127,7 @@ end}
 # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
 # thunderbird-102.8.0.b2.processed-source.tar.xz
 # When unset use processed source file name as is.
-%global buildnum .b3
+#%%global buildnum .b2
 
 %bcond_without langpacks
 
@@ -137,8 +137,8 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        128.9.0
-Release:        2%{?dist}
+Version:        128.9.2
+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}-20250331.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20250416.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}
@@ -1660,6 +1661,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Wed Apr 16 2025 Eike Rathke <erack@redhat.com> - 128.9.2-1
+- Update to 128.9.2
+
 * Mon Mar 31 2025 Eike Rathke <erack@redhat.com> - 128.9.0-2
 - Update to 128.9.0 build3