From 967a03635c53c3e42ce362ac9a4ec3a953db4bd0 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Mon, 8 Jul 2024 12:09:18 +0200
Subject: [PATCH] Update to 115.13.0 build1

Resolves: RHEL-46399
---
 .gitignore                 |  2 ++
 build-tb-rnp-openssl.patch | 12 ------------
 sources                    |  2 ++
 thunderbird.spec           | 13 +++++++------
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 build-tb-rnp-openssl.patch

diff --git a/.gitignore b/.gitignore
index 53b7716..ce6f3ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@ SOURCES/thunderbird-symbolic.svg
 /thunderbird-115.12.0.b2.processed-source.tar.xz
 /thunderbird-115.12.1.processed-source.tar.xz
 /thunderbird-langpacks-115.12.1-20240618.tar.xz
+/thunderbird-115.13.0.processed-source.tar.xz
+/thunderbird-langpacks-115.13.0esr-20240708.tar.xz
diff --git a/build-tb-rnp-openssl.patch b/build-tb-rnp-openssl.patch
deleted file mode 100644
index d0d9346..0000000
--- a/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/sources b/sources
index 135c4de..bf0f756 100644
--- a/sources
+++ b/sources
@@ -4,3 +4,5 @@ SHA512 (nss-3.90.0-2.el8_1.src.rpm) = 850cd6a343e62d34ad28ac356db03371f0b1f01827
 SHA512 (nss-3.90.0-3.el9_0.src.rpm) = f321b9c1bda0b09eee564e2903023435851a4ff2e55bdd5b03012ca51be7999b18d85061f874065d0b25913721eb574f49746a3111f8f1cdd5b21268dddd8367
 SHA512 (thunderbird-115.12.1.processed-source.tar.xz) = bef06c1136069d5ba76ce4ca759f2268b61e1424ff14de9ec831a49198954fb1e39f3d28709e838f5eb8b119b35454c40f03bc3f98ec7f7325c52ae05cb3c575
 SHA512 (thunderbird-langpacks-115.12.1-20240618.tar.xz) = 033d0641b2c1445fa0af7aa3a0e629bdbcea2d408f356519a689d502bac547bcf74f262fc414bc103cc646ac06be754bd1beb68e86e0d144b73faa74c5ee04d7
+SHA512 (thunderbird-115.13.0.processed-source.tar.xz) = 0086103890416db50e6209c9e28a2cd1c0d003c389d4ebad03605d5a8fcfa657110527bce62ce6c2c6094b5db80a95c1de0e03bb9ca1c944a7580424ce38a115
+SHA512 (thunderbird-langpacks-115.13.0esr-20240708.tar.xz) = 85e7bb6e7886179a3e4e2b6e8ca6009879517a040de262a8acf96df57f87e66a297f334ec16f223e76857d691cef4dc0250ee7b325a881fd00b6bd76fcb8d397
diff --git a/thunderbird.spec b/thunderbird.spec
index bc242ff..eba5aba 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -134,7 +134,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        115.12.1
+Version:        115.13.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}-20240618.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20240708.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -191,8 +191,7 @@ Patch03:        build-big-endian-errors.patch
 Patch05:        build-rhel7-lower-node-min-version.patch
 Patch06:        build-ppc64-abiv2.patch
 Patch07:        build-rhel7-nasm-dwarf.patch
-Patch08:        build-tb-rnp-openssl.patch
-Patch09:        disable-openpgp-in-thunderbird.patch
+Patch08:        disable-openpgp-in-thunderbird.patch
 
 # -- Upstreamed patches --
 Patch51:       mozilla-bmo1170092.patch
@@ -926,9 +925,8 @@ echo "--------------------------------------------"
 %patch -P7 -p1 -b .build-rhel7-nasm-dwarf
   %endif
 %endif
-%patch -P8 -p1 -b .build-rnp-openssl
 %if !%{?use_openssl_for_librnp}
-%patch -P9 -p1 -b .disable-openpgp-in-thunderbird
+%patch -P8 -p1 -b .disable-openpgp-in-thunderbird
 %endif
 
 # -- Upstreamed patches --
@@ -1514,6 +1512,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Jul 08 2024 Tomas Popela <tpopela@redhat.com> - 115.13.0-1
+- Update to 115.13.0 build1
+
 * Tue Jun 18 2024 Eike Rathke <erack@redhat.com> - 115.12.1-1
 - Update to 115.12.1 build1