From 8204575561748f031f761a7ea8166d84099951bc Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Tue, 28 Jun 2022 10:58:41 +0200
Subject: [PATCH] Resolves: #2098637 Update to 91.11.0 build2

---
 .gitignore       |  2 ++
 sources          |  4 ++--
 thunderbird.spec | 13 ++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71761e1..09cca5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 /thunderbird-langpacks-91.10.0-20220530.tar.xz
 /thunderbird-91.11.0.processed-source.tar.xz
 /thunderbird-langpacks-91.11.0-20220623.tar.xz
+/thunderbird-91.11.0.b2.processed-source.tar.xz
+/thunderbird-langpacks-91.11.0-20220628.tar.xz
diff --git a/sources b/sources
index eb6b573..7c7515b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb4a590584c53386a14deb1f1faf7b67ff8f312eff4a8dccab710738183c504387d69fa660021b495ed61603f4df1db689f35234c61e2e886962e40aab20c95
 SHA512 (nss-3.67.0-7.el8_1.src.rpm) = 15361c596fc4f2e4afc7d40d48c37886cad93849821d2bcad8213f34035a6951be127b436b6799083f2b4adb18a68870dbe273177d2d670eda9cc9680e6d6f63
 SHA512 (nspr-4.32.0-1.el8_1.src.rpm) = c181a19bc24aeb62aed1745a6a43ae8aa2ee0d903aa16cb6ec7d385286e60f6426049cc9669459434377a215f329502ffe6fc48a1edc52d5b3283ebc259e9dca
-SHA512 (thunderbird-91.11.0.processed-source.tar.xz) = 182ed5f51b00d15af3dba004bfca1dd2ddd72f0a107654378cbce5ac8d6c16be5460edd6a3dec4d5ae3077476147a6b110631d9e939f06b379c0c9cc59a92485
-SHA512 (thunderbird-langpacks-91.11.0-20220623.tar.xz) = e7d710d99d91436448f8aef95fae73701ef49e45431eb2cd6759a0e46518f19aef85595130dc6a3916bedada77cea62cf23cb0b0f3b8c072c3431443f0f6f9e9
+SHA512 (thunderbird-91.11.0.b2.processed-source.tar.xz) = 19731262e6f6fd7c104a97edc5378dfd3b243a80d6e07ca5c70eef0293bf03be417f9870895c2127e2b1cf8d2ab8c11be22875623b5a1389edc91c540fc91f94
+SHA512 (thunderbird-langpacks-91.11.0-20220628.tar.xz) = 9cc8d12246771ad706db278dc1e05bc041fdee221c15cefeecf2ea0c77d16e6da32ed8446ec080ebcd318b4358ea8eac0b81820482902af91d2c50132ca267b9
diff --git a/thunderbird.spec b/thunderbird.spec
index aa51fdf..55f5e02 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -129,14 +129,14 @@ end}
 # Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive.
 # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
 # thunderbird-91.9.0.b2.processed-source.tar.xz
-# With does_not_exist it's empty and source file name as is.
-#global buildnum %{?does_not_exist}
-%global buildnum %{?does_not_exist}
+# When unset use processed source file name as is.
+#global buildnum .b2
+%global buildnum .b2
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        91.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -158,7 +158,7 @@ ExcludeArch:    s390 ppc
 # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220623.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        get-calendar-langpacks.sh
@@ -1115,6 +1115,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Jun 28 2022 Eike Rathke <erack@redhat.com> - 91.11.0-2
+- Update to 91.11.0 build2
+
 * Thu Jun 23 2022 Eike Rathke <erack@redhat.com> - 91.11.0-1
 - Update to 91.11.0 build1