diff --git a/.gitignore b/.gitignore index 114f12d..e35827a 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.4.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-91.4.0-20211206.tar.xz +SOURCES/thunderbird-91.5.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 4f4bb2b..df739f9 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 -b547aff4246db7d2c7c6e9ff0f0be49ead13bfdb SOURCES/thunderbird-91.4.0.processed-source.tar.xz -3d730091ab572437549ce4271b407c39b3289045 SOURCES/thunderbird-langpacks-91.4.0-20211206.tar.xz +96483930beccc90117f19d77eb57f982aad086ea SOURCES/thunderbird-91.5.0.processed-source.tar.xz +db0eadc8a9ece29e56420ad74faf0df3545acbe8 SOURCES/thunderbird-langpacks-91.5.0-20220107.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 f7f8e4a..44d9138 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -128,8 +128,8 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.4.0 -Release: 3%{?dist} +Version: 91.5.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -138,10 +138,14 @@ Group: Applications/Internet ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + %if %{rhel_minor_version} == 1 +ExcludeArch: %{ix86} aarch64 s390x + %else ExcludeArch: %{ix86} + %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -151,7 +155,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}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20211206.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220107.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -172,7 +176,6 @@ 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 Patch1008: build-rhel7-nasm-dwarf.patch Patch1009: build-debuginfo-fix.patch # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 @@ -638,7 +641,7 @@ function build_bundled_package() { echo $PKG_CONFIG_PATH rpm -ivh %{SOURCE403} - rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/nss.spec + rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec pushd %{_buildrootdir} #cleanup #rm -rf {_buildrootdir}/usr/lib/debug/* @@ -1159,6 +1162,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Jan 07 2022 Eike Rathke - 91.5.0-1 +- Update to 91.5.0 build1 + * Tue Dec 07 2021 Eike Rathke - 91.4.0-3 - Bump NVR for ppc64 build