diff --git a/.gitignore b/.gitignore
index e35827a..3a65830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.32.0-1.el8_1.src.rpm
SOURCES/nss-3.67.0-7.el8_1.src.rpm
-SOURCES/thunderbird-91.5.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz
+SOURCES/thunderbird-91.6.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index df739f9..6f336fa 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,5 +1,5 @@
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-96483930beccc90117f19d77eb57f982aad086ea SOURCES/thunderbird-91.5.0.processed-source.tar.xz
-db0eadc8a9ece29e56420ad74faf0df3545acbe8 SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz
+5f4f619a433c7abc51733215a128dbc7ddb5be0c SOURCES/thunderbird-91.6.0.processed-source.tar.xz
+fe71530869aeb1b6039e0ae4dfc13498c2035560 SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index a559eb5..1e85849 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -128,7 +128,7 @@ end}
%global build_langpacks 1
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 91.5.0
+Version: 91.6.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -155,7 +155,7 @@ ExcludeArch: aarch64 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}.processed-source.tar.xz
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220107.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220207.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: get-calendar-langpacks.sh
@@ -429,7 +429,7 @@ echo "use_rustts %{?use_rustts}"
%patch513 -p1 -b .mozilla-bmo998749
%patch514 -p1 -b .mozilla-s390x-skia-gradient
%patch515 -p1 -b .mozilla-bmo1626236
-#patch237 -p1 -b .disable-openpgp-in-thunderbird
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
%patch1001 -p1 -b .ppc64le-inline
@@ -1014,7 +1014,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
# Removing librnp.so - we cannot deliver that in RHELs
-#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
+%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
# Register as an application to be visible in the software center
#
@@ -1023,47 +1023,10 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
#
# See http://www.freedesktop.org/software/appstream/docs/ for more details.
#
-%{__mkdir_p} %{buildroot}%{_datadir}/appdata
-cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071065
-SentUpstream: 2014-09-22
--->
-<application>
- <id type="desktop">mozilla-thunderbird.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>MPLv1.1 or GPLv2+ or LGPLv2+</project_license>
- <description>
- <p>
- Thunderbird is an email client that allows you to read, write and organise all
- of your email messages. It is compatible with most email accounts, including the
- most popular webmail services.
- </p>
- <p>
- Thunderbird is designed by Mozilla, a global community working together to make
- the Internet better. Mozilla believe that the Internet should be open, public,
- and accessible to everyone without any restrictions.
- </p>
- <ul>
- <li>Easier than ever to set up a new e-mail account</li>
- <li>Awesome search allows you to find your messages fast</li>
- <li>Thousands of add-ons give you the freedom to make Thunderbird your own</li>
- </ul>
- </description>
- <url type="homepage">http://www.mozilla.org/thunderbird/</url>
- <screenshots>
- <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png</screenshot>
- </screenshots>
- <releases>
- <release version="%{version}" date="$(date '+%F')"/>
- </releases>
- <!-- FIXME: change this to an upstream email address for spec updates
- <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
- -->
-</application>
-EOF
+
+# Register as an application to be visible in the software center
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml
#---------------------------------------------------------------------
@@ -1155,9 +1118,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Wed Jan 12 2022 CentOS Sources <bugs@centos.org> - 91.5.0-1.el8.centos
+* Tue Feb 15 2022 CentOS Sources <bugs@centos.org> - 91.6.0-1.el8.centos
- Apply debranding changes
+* Mon Feb 07 2022 Eike Rathke <erack@redhat.com> - 91.6.0-1
+- Update to 91.6.0 build1
+
* Fri Jan 07 2022 Eike Rathke <erack@redhat.com> - 91.5.0-1
- Update to 91.5.0 build1