From c23564afc7b83ce6fd58cadb5d79117be638df00 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jun 02 2022 13:13:41 +0000
Subject: import and debrand thunderbird-91.10.0-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index fa57a27..45ac021 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.9.1.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.9.1-20220523.tar.xz
+SOURCES/thunderbird-91.10.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 97b8738..9fe2363 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
-4a4c1c234f9e16c184726d8327f4788402e93b82 SOURCES/thunderbird-91.9.1.processed-source.tar.xz
-fb1e4275d84a8ef4f9b3ad82ef759f35e25034b5 SOURCES/thunderbird-langpacks-91.9.1-20220523.tar.xz
+3ad159989de51587768618bd07f3f076f51202dc SOURCES/thunderbird-91.10.0.processed-source.tar.xz
+51bd5b9f0aaeab733e6b88387a64870602d8a154 SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz
diff --git a/SOURCES/python-missing-utimensat.patch b/SOURCES/python-missing-utimensat.patch
deleted file mode 100644
index d19ecab..0000000
--- a/SOURCES/python-missing-utimensat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up python3/Python-3.6.8/configure.old python3/Python-3.6.8/configure
---- Python-3.6.8/configure.old	2019-10-01 12:56:35.074551835 +0200
-+++ Python-3.6.8/configure	2019-10-01 12:56:44.240517798 +0200
-@@ -11438,7 +11438,7 @@ for ac_func in alarm accept4 setitimer g
-  sigaction sigaltstack siginterrupt sigpending sigrelse \
-  sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \
-  sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
-- truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \
-+ truncate uname unlinkat unsetenv utimes waitid waitpid wait3 wait4 \
-  wcscoll wcsftime wcsxfrm wmemcmp writev _getpty
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 448f863..f47d01a 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -136,7 +136,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        91.9.1
+Version:        91.10.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -163,7 +163,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}-20220523.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220530.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        get-calendar-langpacks.sh
@@ -184,7 +184,7 @@ Source402:      nspr-4.32.0-1.el8_1.src.rpm
 # Build patches
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
 Patch1001:      build-ppc64le-inline.patch
-Patch1003:      python-missing-utimensat.patch
+#Patch1003:      python-missing-utimensat.patch
 Patch1008:        build-rhel7-nasm-dwarf.patch
 Patch1009:        build-debuginfo-fix.patch
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
@@ -195,7 +195,7 @@ Patch6:         build-nss-version.patch
 Patch215:        firefox-enable-addons.patch
 Patch219:        rhbz-1173156.patch
 Patch224:        mozilla-1170092.patch
-#Patch237:        disable-openpgp-in-thunderbird.patch
+Patch237:        disable-openpgp-in-thunderbird.patch
 
 # Upstream patches
 
@@ -448,7 +448,7 @@ echo "use_rustts            %{?use_rustts}"
 %patch516 -p1 -b .expat-CVE-2022-25235
 %patch517 -p1 -b .expat-CVE-2022-25236
 %patch518 -p1 -b .expat-CVE-2022-25315
-#patch237 -p1 -b .disable-openpgp-in-thunderbird
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -1038,7 +1038,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
 #
@@ -1142,6 +1142,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon May 30 2022 Eike Rathke <erack@redhat.com> - 91.10.0-1
+- Update to 91.10.0 build1
+
 * Mon May 23 2022 Jan Horak <jhorak@redhat.com> - 91.9.1-1
 - Update to 91.9.1 build1