Merge branch 'a9' into a9-plus

This commit is contained in:
Andrew Lukoshko 2022-06-02 13:14:30 +00:00
commit a35473dd00
4 changed files with 11 additions and 20 deletions

4
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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`

View File

@ -135,7 +135,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 91.9.1
Version: 91.10.0
Release: 1%{?dist}.alma.plus
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -158,7 +158,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
@ -179,7 +179,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
@ -1115,9 +1115,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Thu May 26 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.9.1-1.alma
* Thu Jun 02 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.10.0-1.alma
- Debrand for AlmaLinux
* 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