From ef399d598b28d070cda156cb954b1bb8e9e923ac Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Tue, 10 Aug 2021 21:25:07 +0200
Subject: [PATCH] Resolves: #1990543 Update to 78.13.0

Also fix various
warning: Macro expanded in comment ...
---
 .gitignore       |  2 ++
 sources          |  4 ++--
 thunderbird.spec | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c7a162..033a980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,3 +258,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-78.12.0.source.tar.xz
 /thunderbird-langpacks-78.12.0-20210712.tar.xz
 /thunderbird-78.12.0.processed-source.tar.xz
+/thunderbird-langpacks-78.13.0-20210804.tar.xz
+/thunderbird-78.13.0.processed-source.tar.xz
diff --git a/sources b/sources
index 83225bb..74df1b0 100644
--- a/sources
+++ b/sources
@@ -8,5 +8,5 @@ SHA512 (nspr-4.25.0-1.el8_0.src.rpm) = 7e39e4484b0d504e1b7f1253d7dc1f9f0d45705fb
 SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39caacac787bf8ed8b346478822e74da5a4a1f57ab4df4105fa8376739a2ece888845a85bc5712aaed20e4a508bc
 SHA512 (nss-3.53.1-3.fc32.src.rpm) = 368849487aa8f9d602c9e5d9d7c88ebd03318aece12470283ff31744ef9eed27ef1e32031378a5a673bb06a9ebbcf5542afa13f3ad465409449c218922189acb
 SHA512 (nodejs-10.21.0-5.fc32.src.rpm) = 4d0c212a2609dc10e242a96f63baa8babb91e8aa6696f66f627c562c1ba30cb3632ed01991c98f48b5942fc7fd89ee34b350f41de901339b49a2c19e979593a7
-SHA512 (thunderbird-langpacks-78.12.0-20210712.tar.xz) = ea243e0c7dbbd2d81675a106b86d02e55914a67ef56696d43ea5a4f211fdfccbc3e52638c0a8bdb264b7005d4432c475b6b5e7610c614cbf1da3e1e6e1f0d462
-SHA512 (thunderbird-78.12.0.processed-source.tar.xz) = a0d345c863e26049c13b702bb0ed6eb00b3ee822012f81d8ad6476f3708d505b9a88102c7d85276383ac1fefb005f03ef5df21964cfc7b22e43b8e7777740c2d
+SHA512 (thunderbird-langpacks-78.13.0-20210804.tar.xz) = c3e47a28a34db66dde2b7a4b715ed736ba68fb2e456daa7219141fad60d0a83516e1066d68a443fc3569e7570771ceb8b89dc4b99ca009540f96fdda68ab3965
+SHA512 (thunderbird-78.13.0.processed-source.tar.xz) = 8d25744fa64dfc2a580a55d1fae7cf49b41393098ec15d406540a62e2233f9de55fb452775c6b40c03af9e1ee3db544667fe46c05bd2e10f1325fb3063243e86
diff --git a/thunderbird.spec b/thunderbird.spec
index 8887cb6..38e3541 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -133,10 +133,10 @@ end}
 %global nspr_version 4.25
 # NSS/NSPR quite often ends in build override, so as requirement the version
 # we're building against could bring us some broken dependencies from time to time.
-#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
+#%%global nspr_build_version %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.53.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
+#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global nss_build_version %{nss_version}
 %endif
 
@@ -177,8 +177,8 @@ end}
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        78.12.0
-Release:        4%{?dist}
+Version:        78.13.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -191,10 +191,10 @@ ExcludeArch:    s390 ppc
 # licenses that are rejected by Red Hat Legal.
 # The official tarball has to be always processed by the process-official-tarball
 # script.
-# Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
+# 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}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210712.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210804.tar.xz
 # Locales for lightning
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
@@ -1291,7 +1291,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/fonts/TwemojiMozilla.ttf
 
 %if !%{?system_libicu}
-#%{mozappdir}/icudt*.dat
+#%%{mozappdir}/icudt*.dat
 %endif
 %if !%{?system_nss}
 %exclude %{mozappdir}/libnssckbi.so
@@ -1317,6 +1317,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Aug 10 2021 Eike Rathke <erack@redhat.com> - 78.13.0-1
+- Update to 78.13.0
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 78.12.0-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688