From c3b777ede718d69e902f7195baeead8427bacf60 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jan 28 2021 20:03:51 +0000
Subject: Import and Debrand thunderbird-78.7.0-1


---

diff --git a/.gitignore b/.gitignore
index c896bc9..98a0d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ SOURCES/nodejs-10.21.0-5.fc32.src.rpm
 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 SOURCES/nss-3.53.1-3.fc32.src.rpm
 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-SOURCES/thunderbird-78.6.1.source.tar.xz
-SOURCES/thunderbird-langpacks-78.6.1-20210112.tar.xz
+SOURCES/thunderbird-78.7.0.source.tar.xz
+SOURCES/thunderbird-langpacks-78.7.0-20210126.tar.xz
 SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 1656d43..813cd3c 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -6,6 +6,6 @@ e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm
 a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-2c50e48e0e5bb8117a69ac698416af4f707b991e SOURCES/thunderbird-78.6.1.source.tar.xz
-1b9b16dd09bb9473c5b9e1c70dc5c23707bafbfc SOURCES/thunderbird-langpacks-78.6.1-20210112.tar.xz
+88e36ea3ae7cb0e18da49edc103e2d3451c9fdec SOURCES/thunderbird-78.7.0.source.tar.xz
+efcdcfab6824ba8f416cf5d1ac7434df7a8d80ac SOURCES/thunderbird-langpacks-78.7.0-20210126.tar.xz
 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 1f9137c..6f29915 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -194,7 +194,7 @@
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        78.6.1
+Version:        78.7.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -210,7 +210,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210112.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210126.tar.xz
 # Locales for lightning
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
@@ -579,7 +579,7 @@ echo "use_bundled_yasm      %{?use_bundled_yasm}"
 %endif
 
 %patch236 -p1 -b .fedora-shebang-build
-#patch237 -p1 -b .disable-openpgp-in-thunderbird
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
 
 %if 0%{?rhel} == 6
 %patch232 -p1 -b .hugepage
@@ -1341,7 +1341,7 @@ test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-segmentation/s
 test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/unicode.py" && sed -i -e 's|/usr/bin/env python$|/usr/bin/env python2|' %{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/unicode.py
 
 # Removing librnp.so - we cannot deliver that in RHELs
-# {__rm} -rf %{buildroot}%{mozappdir}/librnp.so
+%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
 
 #---------------------------------------------------------------------
 
@@ -1457,9 +1457,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Wed Jan 13 2021 CentOS Sources <bugs@centos.org> - 78.6.1-1.el8.centos
+* Thu Jan 28 2021 CentOS Sources <bugs@centos.org> - 78.7.0-1.el8.centos
 - Apply debranding changes
 
+* Tue Jan 26 2021 Eike Rathke <erack@redhat.com> - 78.7.0-1
+- Update to 78.7.0
+
 * Tue Jan 12 2021 Eike Rathke <erack@redhat.com> - 78.6.1-1
 - Update to 78.6.1