diff --git a/.gitignore b/.gitignore
index ca90fe6..c896bc9 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.0.source.tar.xz
-SOURCES/thunderbird-langpacks-78.6.0-20201215.tar.xz
+SOURCES/thunderbird-78.6.1.source.tar.xz
+SOURCES/thunderbird-langpacks-78.6.1-20210112.tar.xz
SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 5ef8a53..1656d43 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
-12bb1be74b705104e42afc84bbf1cbf0f21539a8 SOURCES/thunderbird-78.6.0.source.tar.xz
-b2946696fa04ae6f8f2f6c029755c6f39f6abf8d SOURCES/thunderbird-langpacks-78.6.0-20201215.tar.xz
+2c50e48e0e5bb8117a69ac698416af4f707b991e SOURCES/thunderbird-78.6.1.source.tar.xz
+1b9b16dd09bb9473c5b9e1c70dc5c23707bafbfc SOURCES/thunderbird-langpacks-78.6.1-20210112.tar.xz
77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index e1cae73..1e8624d 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -7,8 +7,11 @@
%endif
%global rhel_minor_version -1
+%if 0%{?flatpak:1}
+%global rhel_minor_version 4
+%endif
%if "%{?dist}" == ".el8"
-%global rhel_minor_version 3
+%global rhel_minor_version 4
%endif
%if "%{?dist}" == ".el8_3"
%global rhel_minor_version 3
@@ -191,7 +194,7 @@
%global build_langpacks 1
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 78.6.0
+Version: 78.6.1
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -207,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}-20201215.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210112.tar.xz
# Locales for lightning
%endif
Source2: cbindgen-vendor-0.14.3.tar.xz
@@ -507,6 +510,13 @@ BuildRequires: chrpath
BuildRequires: libatomic
BuildRequires: openssl-devel
%endif
+
+%if 0%{?big_endian}
+ %if 0%{?flatpak}
+BuildRequires: icu
+ %endif
+%endif
+
Obsoletes: thunderbird-lightning
# ==================================================================================
# Override internal dependency generator to avoid showing libraries provided by this package
@@ -1016,12 +1026,19 @@ export CBINDGEN=`pwd`/.cargo/bin/cbindgen
./mach python -c "import sys;print(sys.path)"
%if 0%{?big_endian}
+ %if 0%{?flatpak}
+echo "Generate big endian version of config/external/icu/data/icud58l.dat"
+icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
+ls -l config/external/icu/data
+rm -f config/external/icu/data/icudt*l.dat
+ %else
echo "Generate big endian version of config/external/icu/data/icud64l.dat"
./mach python intl/icu_sources_data.py .
rm -f config/external/icu/data/icudt*l.dat
# mv config/external/icu/data/icudt64l.dat config/external/icu/data/icudt64b.dat
ls -l config/external/icu/data
cat /tmp/icu-make*
+ %endif
%endif
mkdir %{_buildrootdir}/bin || :
@@ -1440,8 +1457,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Thu Dec 17 2020 CentOS Sources <bugs@centos.org> - 78.6.0-1.el8.centos
-- Apply debranding changes
+* Tue Jan 12 2021 Eike Rathke <erack@redhat.com> - 78.6.1-1
+- Update to 78.6.1
* Tue Dec 15 2020 Eike Rathke <erack@redhat.com> - 78.6.0-1
- Update to 78.6.0