From eb6994d2a63f570f72085b7ed2ec0e2b70019ab8 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 15 Apr 2024 12:54:39 +0200
Subject: [PATCH] Update to 115.10.0 build2

Resolves: RHEL-31463
---
 .gitignore       | 2 ++
 sources          | 4 ++--
 thunderbird.spec | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index be9be88..3c38713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@ SOURCES/thunderbird-symbolic.svg
 /thunderbird-langpacks-115.9.0-20240318.tar.xz
 /thunderbird-115.10.0.processed-source.tar.xz
 /thunderbird-langpacks-115.10.0-20240412.tar.xz
+/thunderbird-115.10.0.b2.processed-source.tar.xz
+/thunderbird-langpacks-115.10.0-20240415.tar.xz
diff --git a/sources b/sources
index cb5f222..c633ce3 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (cbindgen-vendor.tar.xz) = 161811f4adfc74e5d92871c78139704d32e1e1ad6b615c
 SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
 SHA512 (nss-3.90.0-2.el8_1.src.rpm) = 850cd6a343e62d34ad28ac356db03371f0b1f018274901cc700cc4f8138c9929eb159bbb1ebe167f727a69f6499423a54581ca65ed655ee468f1cae8450df85c
 SHA512 (nss-3.90.0-3.el9_0.src.rpm) = f321b9c1bda0b09eee564e2903023435851a4ff2e55bdd5b03012ca51be7999b18d85061f874065d0b25913721eb574f49746a3111f8f1cdd5b21268dddd8367
-SHA512 (thunderbird-115.10.0.processed-source.tar.xz) = 0bff04b3bbb5a1f4c461f3c40e91cddc8f76fbf2119979aefc27d0a9330615903c4f3164e0660a9f3ac22410f08171e27314f765f5775bee7c65394d0702430c
-SHA512 (thunderbird-langpacks-115.10.0-20240412.tar.xz) = 7061ed81202ac484077e676395f85fe23ec0f5fce9cf4d5978c638aa6b884b411703680f13166b0207ea49f4895c44eed3851fda1bc1e40ef89baedafe8f53ec
+SHA512 (thunderbird-115.10.0.b2.processed-source.tar.xz) = 823991e595cb8ebb7d401f7e7795a77d4dc8ea6896232d4137036a31b7f02988fe3ae3a562d9ff6bd5ed572337158544b4afa67cef024b92f8d76279ddac85f3
+SHA512 (thunderbird-langpacks-115.10.0-20240415.tar.xz) = 1a2beccc0ca0411ad46b7daaa7bfbd21edd86856304d38129827818adaebf5df5f15502fd9bd13dd80a13b97a75480587328d94ec17c7e511f9ffbff34a76bd1
diff --git a/thunderbird.spec b/thunderbird.spec
index 77b675c..c92c984 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -124,7 +124,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             .b2
+%global buildnum .b2
 
 %bcond_without langpacks
 
@@ -135,7 +135,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -165,7 +165,7 @@ ExcludeArch:    aarch64 s390 ppc ppc64
 #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}-20240412.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20240415.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -1514,6 +1514,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Apr 15 2024 Eike Rathke <erack@redhat.com> - 115.10.0-2
+- Update to 115.10.0 build2
+
 * Fri Apr 12 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
 - Update to 115.10.0 build1
 - Revert expat CVE-2023-52425 fix