From b58a21f504802fc6a1e7e89ea895d93a11ec61d1 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Sat, 21 Oct 2023 15:06:36 +0200
Subject: [PATCH] Update to 115.4.0 build2

Resolves: RHEL-14563
---
 .gitignore       |  2 ++
 sources          |  4 ++--
 thunderbird.spec | 26 +++++++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b537956..2287590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,5 @@
 /thunderbird-115.3.1.processed-source.tar.xz
 /thunderbird-langpacks-115.4.0-20231020.tar.xz
 /thunderbird-115.4.0.processed-source.tar.xz
+/thunderbird-langpacks-115.4.0-20231021.tar.xz
+/thunderbird-115.4.0.b2.processed-source.tar.xz
diff --git a/sources b/sources
index c9cc4a1..d3acfe8 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-langpacks-115.4.0-20231020.tar.xz) = eedb2ac0bb9f6b16bfa6ea60fdf0aa0625d084449a4cb0b2c26a23b4efbe581588dcd86fbaa5352e2f0487bd273f8b0eae9ab104cc7e1bdc25b0de045879eb30
-SHA512 (thunderbird-115.4.0.processed-source.tar.xz) = 0399e41560fedb590f51c88df39ea47937e7e843e55ae2291f9b22d5bb25563de35535e1c622c5eac2fc41db6dce93a842b1bff092ae5527c9a70957b9963d1c
+SHA512 (thunderbird-langpacks-115.4.0-20231021.tar.xz) = 527bf079efffbaba3f6d887326ad89421fbb4fc2873fe45291cfeebeeb7e4fb432758089e019c00f869006a054ead3cb339ceed43254db9a1234c37107b3be60
+SHA512 (thunderbird-115.4.0.b2.processed-source.tar.xz) = b523db9879b2ac296260aa257b9149f81ab78810841f09484304efc01e0a5f56ff9d064614807e8273311e146dff29b213ff2c1aec79fd6d687b6fe5a4f62af2
diff --git a/thunderbird.spec b/thunderbird.spec
index aa324c2..48983f8 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -125,6 +125,7 @@ end}
 # 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 +136,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -160,7 +161,7 @@ ExcludeArch:    aarch64 s390 ppc
 #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}-20230929.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20231021.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -891,15 +892,15 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %prep
 echo "Build environment"
 echo "--------------------------------------------"
-echo "dist                  %{?dist}"
-echo "RHEL 8 minor version: %{?rhel_minor_version}"
-echo "bundle_nss            %{?bundle_nss}"
-echo "system_nss            %{?system_nss}"
-echo "use_rust_ts           %{?use_rust_ts}"
-echo "use_dts               %{?use_dts}"
-echo "use_nodejs_scl        %{?use_nodejs_scl}"
-echo "use_llvm_ts           %{?use_llvm_ts}"
-echo "use_python3_scl       %{?use_python3_scl}"
+echo "dist                %{?dist}"
+echo "RHEL minor version: %{?rhel_minor_version}"
+echo "bundle_nss          %{?bundle_nss}"
+echo "system_nss          %{?system_nss}"
+echo "use_rust_ts         %{?use_rust_ts}"
+echo "use_dts             %{?use_dts}"
+echo "use_nodejs_scl      %{?use_nodejs_scl}"
+echo "use_llvm_ts         %{?use_llvm_ts}"
+echo "use_python3_scl     %{?use_python3_scl}"
 echo "--------------------------------------------"
 
 %setup -q
@@ -1502,6 +1503,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Sat Oct 21 2023 Eike Rathke <erack@redhat.com> - 115.4.0-2
+- Update to 115.4.0 build2
+
 * Fri Oct 20 2023 Eike Rathke <erack@redhat.com> - 115.4.0-1
 - Update to 115.4.0 build1