From 407640a7ab6388ca4ab10ccf98c2c5ec711b6145 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 4 Jan 2024 07:21:23 +0000
Subject: [PATCH] import CS thunderbird-115.6.0-1.el8

---
 .gitignore             |  4 ++--
 .thunderbird.metadata  |  4 ++--
 SPECS/thunderbird.spec | 13 ++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7508dd8..07d5270 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.90.0-2.el8_1.src.rpm
 SOURCES/nss-3.90.0-3.el9_0.src.rpm
-SOURCES/thunderbird-115.5.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz
+SOURCES/thunderbird-115.6.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-115.6.0-20231218.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 2ff9781..2ad3c61 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
 d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
 39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
 df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
-5a7ac4a9bd48e160ad1fcac18f4bb2660f5672e1 SOURCES/thunderbird-115.5.0.processed-source.tar.xz
-659e4bde9e34477277c3a7e6d09457cbe9340b44 SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz
+9bae1ff495719abed7db2d12735431aad655e436 SOURCES/thunderbird-115.6.0.processed-source.tar.xz
+42ee128db6384decdc7980c22e2df8792868ca7d SOURCES/thunderbird-langpacks-115.6.0-20231218.tar.xz
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index b9e854c..d22d091 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -134,7 +134,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        115.5.0
+Version:        115.6.0
 Release:        1%{?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}-20231121.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20231218.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -1419,9 +1419,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
 %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
 sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
 
-#===============================================================================
-
-%clean
+# Clean the created bundled rpms.
 rm -rf %{_srcrpmdir}/libffi*.src.rpm
 find %{_rpmdir} -name "libffi*.rpm" -delete
 rm -rf %{_srcrpmdir}/openssl*.src.rpm
@@ -1431,6 +1429,8 @@ find %{_rpmdir} -name "nss*.rpm" -delete
 rm -rf %{_srcrpmdir}/nspr*.src.rpm
 find %{_rpmdir} -name "nspr*.rpm" -delete
 
+#===============================================================================
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -1514,6 +1514,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Dec 18 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
+- Update to 115.6.0 build2
+
 * Tue Nov 21 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
 - Update to 115.5.0 build1