From 2b53915477bf22df6c96df41f5fa4f5b9be8c034 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 14 Aug 2024 16:51:21 +0000
Subject: [PATCH] Import from CS git

---
 .gitignore                         |  4 ++--
 .thunderbird.metadata              |  4 ++--
 SOURCES/build-tb-rnp-openssl.patch | 12 ------------
 SPECS/thunderbird.spec             | 11 +++++++----
 4 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 SOURCES/build-tb-rnp-openssl.patch

diff --git a/.gitignore b/.gitignore
index 968112f..38f88e2 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.13.0.b5.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-115.13.0-20240716.tar.xz
+SOURCES/thunderbird-115.14.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-115.14.0-20240805.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 1a16ff7..b09cedb 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
-edaa489a1ace321a8efdd9a706e2ce18d87fb092 SOURCES/thunderbird-115.13.0.b5.processed-source.tar.xz
-27d8cb8b0d96464a810f6d8393990c5bef601784 SOURCES/thunderbird-langpacks-115.13.0-20240716.tar.xz
+71739d9f0163f9d0f91a13cb1d356476673bb9da SOURCES/thunderbird-115.14.0.processed-source.tar.xz
+d2eb21b4898b949136ed9843ca1a7756376b438d SOURCES/thunderbird-langpacks-115.14.0-20240805.tar.xz
diff --git a/SOURCES/build-tb-rnp-openssl.patch b/SOURCES/build-tb-rnp-openssl.patch
deleted file mode 100644
index d0d9346..0000000
--- a/SOURCES/build-tb-rnp-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl thunderbird-115.1.0/comm/third_party/rnp/moz.build
---- thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl	2023-08-07 16:38:39.272780256 +0200
-+++ thunderbird-115.1.0/comm/third_party/rnp/moz.build	2023-08-07 16:38:42.822780087 +0200
-@@ -93,7 +93,7 @@ elif CONFIG["MZLA_LIBRNP_BACKEND"] == "o
-         # Supported, but not with RHEL's OpenSSL, disabled for now;
-         "ENABLE_BRAINPOOL": False,
-     })
--    rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
-+    #rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
-     if CONFIG["MZLA_LIBRNP_OPENSSL_VERSION"][0] == "3":
-         rnp_defines["CRYPTO_BACKEND_OPENSSL3"] = True
- 
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 4c1fa82..4d480f5 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/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 .b5
+##global buildnum .b2
 
 %bcond_without langpacks
 
@@ -134,8 +134,8 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        115.13.0
-Release:        3%{?dist}
+Version:        115.14.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}-20240716.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20240805.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -1515,6 +1515,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Aug 05 2024 Eike Rathke <erack@redhat.com> - 115.14.0-1
+- Update to 115.14.0 build1
+
 * Tue Jul 16 2024 Eike Rathke <erack@redhat.com> - 115.13.0-3
 - Update to 115.13.0 build5