diff --git a/.gitignore b/.gitignore
index d47ffc6..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.8.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.8.0-20220405.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 a40c082..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
-7f97946153fe61dd7da01fdb3e2e367c7f24bcf5 SOURCES/thunderbird-91.8.0.processed-source.tar.xz
-23d8ffc635a34725c989f591cc074f329b8e35db SOURCES/thunderbird-langpacks-91.8.0-20220405.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/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/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 986a080..d0f258d 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -19,7 +19,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el8")
if match then
- return 6
+ return 7
end
return -1
end}
@@ -126,9 +126,17 @@ end}
%global official_branding 1
%global build_langpacks 1
+
+# Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive.
+# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
+# thunderbird-91.9.0.b2.processed-source.tar.xz
+# With does_not_exist it's empty and source file name as is.
+#global buildnum %{?does_not_exist}
+%global buildnum %{?does_not_exist}
+
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 91.8.0
+Version: 91.10.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -153,9 +161,9 @@ ExcludeArch: aarch64 s390 ppc
# 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
-Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
+Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220405.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220530.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: get-calendar-langpacks.sh
@@ -176,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
@@ -1124,8 +1132,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Tue May 10 2022 CentOS Sources <bugs@centos.org> - 91.8.0-1.el8.centos
-- Apply debranding changes
+* 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
+
+* Tue May 03 2022 Eike Rathke <erack@redhat.com> - 91.9.0-3
+- Update to 91.9.0 build3
+
+* Mon May 02 2022 Eike Rathke <erack@redhat.com> - 91.9.0-2
+- Update to 91.9.0 build2
+
+* Thu Apr 28 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
+- Update to 91.9.0
* Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
- Update to 91.8.0