From e45dd11dd12507d2c5499fac5aeb8047f8ee59a5 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Tue, 27 May 2025 12:48:44 +0000
Subject: [PATCH] import CS thunderbird-128.11.0-1.el10

---
 .gitignore               |  4 ++--
 process-official-tarball |  2 ++
 sources                  |  4 ++--
 thunderbird.spec         | 13 ++++++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c3c825..e689954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ cbindgen-vendor.tar.xz
 nspr-4.35.0-1.el8_1.src.rpm
 nss-3.101.0-7.el8_2.src.rpm
 nss-3.101.0-7.el9_2.src.rpm
-thunderbird-128.10.0esr.processed-source.tar.xz
-thunderbird-langpacks-128.10.0esr-20250428.tar.xz
+thunderbird-128.11.0esr.processed-source.tar.xz
+thunderbird-langpacks-128.11.0esr-20250526.tar.xz
diff --git a/process-official-tarball b/process-official-tarball
index c3f4077..9b6e82c 100755
--- a/process-official-tarball
+++ b/process-official-tarball
@@ -22,6 +22,8 @@ rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confu
 
 # We uses system freetype2
 rm -vrf ./process-tarball-dir/*/modules/freetype2
+# We use system zlib
+rm -vrf ./process-tarball-dir/*/modules/zlib
 
 processed_tarball=${1/source/processed-source}
 
diff --git a/sources b/sources
index a6f9978..8aafdb3 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d
 SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
 SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
-SHA512 (thunderbird-128.10.0esr.processed-source.tar.xz) = e1c886a2992a4f5c807e707383a6d88b3fa36b233c9d6f0db3f051953ab38f4bfd012648f46333fa0a7fe45672e3ac558038c230d1c963b13093d0cc5e5cbe07
-SHA512 (thunderbird-langpacks-128.10.0esr-20250428.tar.xz) = 12e5b4a619d9a08e38fb0de77d2a9ba6ca96cb4fd22529e313d09030e8c5498c00cded08b66dd7bc78789912b9e7d5865bbea0297e6703613c99caaf4de0ae06
+SHA512 (thunderbird-128.11.0esr.processed-source.tar.xz) = 8c31e376ccfa9a9c8ce9749aa9116a9cf68bdae542232be15c5ac5bf5845de32295031e037e9f40d8d8c8c8cb0c047dee02538e3f8abe051cdbe88ca6057921f
+SHA512 (thunderbird-langpacks-128.11.0esr-20250526.tar.xz) = a0c77dbea3513fb2d62016b0232d83f0a86cf66be96abd5a8ea77bcfdc59e00ae5013adbe2e492b193700ad3e795379a03665981a63f5e93c6e8962c71fc09b6
diff --git a/thunderbird.spec b/thunderbird.spec
index 56b49ad..3547782 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -137,7 +137,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        128.10.0
+Version:        128.11.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}-20250428.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20250526.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -476,7 +476,6 @@ Provides: bundled(xsimd)
 Provides: bundled(xsimd)
 Provides: bundled(xz-embedded)
 Provides: bundled(ycbcr)
-Provides: bundled(zlib)
 Provides: bundled(zstd)
 Provides: bundled(Zycore)
 Provides: bundled(Zydis)
@@ -1072,7 +1071,9 @@ echo "--------------------------------------------"
 %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem
 %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem
 %endif
+%if 0%{?rhel} == 8
 %patch -P14 -p1 -b .cargo-lock-version
+%endif
 
 # -- Upstreamed patches --
 %patch -P51 -p1 -b .mozilla-bmo1170092
@@ -1659,6 +1660,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon May 26 2025 Eike Rathke <erack@redhat.com> - 128.11.0-1
+- Update to 128.11.0
+
+* Mon May 19 2025 Eike Rathke <erack@redhat.com> - 128.10.1-1
+- Update to 128.10.1
+
 * Mon Apr 28 2025 Eike Rathke <erack@redhat.com> - 128.10.0-1
 - Update to 128.10.0 build1