From 28a625a07f1d25199921cba474af6a1942cfbed2 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Thu, 18 Dec 2025 11:43:14 +0100
Subject: [PATCH] Update to Thunderbird 170.7 ESR

- Fixed MimeTypes in desktop file, remove bundled(chromium)
- Annobin fix, -O1 only for older rhels on s390x

Resolves: RHEL-138390
---
 .gitignore          | 2 ++
 sources             | 4 ++--
 thunderbird.desktop | 2 +-
 thunderbird.spec    | 8 +++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20117ed..6f2e3d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -177,3 +177,5 @@
 /thunderbird-langpacks-140.5.0esr-20251111.tar.xz
 /thunderbird-140.6.0esr.processed-source.tar.xz
 /thunderbird-langpacks-140.6.0esr-20251209.tar.xz
+/thunderbird-langpacks-140.7.0esr-20260112.tar.xz
+/thunderbird-140.7.0esr.processed-source.tar.xz
diff --git a/sources b/sources
index f666793..47b3098 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (nss-3.112.0-1.el9_4.src.rpm) = 6386239e79f8095b05270b3c8b76ac9203b0df196
 SHA512 (cbindgen-vendor.tar.xz) = 2b8db32c0bca2fa27304ee4fd3a5cc38bc43a11500b23842747813d221e55719c51cf4c0e027e41857f58ce1e283ce97b69c2c7d1eae93ecbb08c2f729e2bf55
 SHA512 (nss-3.112.0-4.el8_2.src.rpm) = 59cca3df7a0ec6a731f4a36f8f560d496d240da0c16650f047ae686e683b883dc2630aedbe46a8b2cb21662c15f03f1efbe99da42055cc3a5418da4839e28da2
 SHA512 (nspr-4.36.0-2.el8_2.src.rpm) = fcc720afd2453a5110975fac9dd06f636491234780b62cbfcc235a485b4935e97c4f438292c686d27d9dc86b56f43399c024bee4fffcdff5f27c62d105310645
-SHA512 (thunderbird-140.6.0esr.processed-source.tar.xz) = 31fc9334e9750a80498a2747e376e9ba8ef7e272879b11e7427e24ffe48a050116f741b7d42b582e900df6b69604926882ddc5c0b2079ba8a4bf227d242a6570
-SHA512 (thunderbird-langpacks-140.6.0esr-20251209.tar.xz) = b0a1b5c21d7bce5d45a40d170adf5e5e9137de2aca6f853939941e55d0dbee7530f7782a1dab6dd6b7f8e8ead0a76cba1862d9d56d8619cf72788499a946b4bc
+SHA512 (thunderbird-langpacks-140.7.0esr-20260112.tar.xz) = 0892ff8633b5dd0a0cd521b3e3b7b0c5076379ab7f4f72b04be84906a3cdaf97e996cc5990c96b6e32299697d64c29fff222504843e514314040e84de50a6d28
+SHA512 (thunderbird-140.7.0esr.processed-source.tar.xz) = 412312ecefb33fbe949d048a498a8518adcc9bf54aa8bd406717f91112ebf21d84b59b08afeaeec93cb51dbaf84d1ff25d990e8f11bdb01524c460ae7418d578
diff --git a/thunderbird.desktop b/thunderbird.desktop
index 1945d1e..43395a0 100644
--- a/thunderbird.desktop
+++ b/thunderbird.desktop
@@ -8,7 +8,7 @@ TryExec=thunderbird
 Icon=thunderbird
 Terminal=false
 Type=Application
-MimeType=message/rfc822;x-scheme-handler/mailto;
+MimeType=message/rfc822;x-scheme-handler/mailto;text/calendar;text/vcard;text/x-vcard;x-scheme-handler/webcal;x-scheme-handler/webcals;x-scheme-handler/mid;
 StartupNotify=true
 Categories=Network;Email;
 Name[cs]=Poštovní klient Thunderbird
diff --git a/thunderbird.spec b/thunderbird.spec
index bcd25df..47f6937 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -137,7 +137,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        140.6.0
+Version:        140.7.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}-20251209.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20260112.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -379,7 +379,6 @@ Provides: bundled(bergamot-translator)
 Provides: bundled(brotli)
 Provides: bundled(bspatch)
 Provides: bundled(cfworker)
-Provides: bundled(chromium)
 Provides: bundled(cld2)
 Provides: bundled(content)
 Provides: bundled(content_analysis_sdk)
@@ -1714,6 +1713,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Jan 12 2026 Jan Horak <jhorak@redhat.com> - 140.7.0-1
+- Update to 140.7.0 ESR
+
 * Tue Dec  9 2025 Jan Horak <jhorak@redhat.com> - 140.6.0-1
 - Update to 140.6.0 ESR