Merge branch 'a9' into a9-plus

This commit is contained in:
eabdullin 2022-10-25 13:51:57 +00:00 committed by Stepan Oksanichenko
commit e5d7d81f1e
4 changed files with 27 additions and 9 deletions

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-6.el8_1.src.rpm
SOURCES/thunderbird-102.3.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
SOURCES/thunderbird-102.4.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-102.4.0-20221017.tar.xz
SOURCES/thunderbird-symbolic.svg

View File

@ -1,6 +1,6 @@
2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
9344c5c96c40ea76f66ef594c16c73a6f72ecd7d SOURCES/thunderbird-102.3.0.processed-source.tar.xz
acfcde32709f2dabf0c99ba19ddd8f4c6515b53a SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
7aa61b1e427a4d57366bcde2f8f322e943675ebf SOURCES/thunderbird-102.4.0.processed-source.tar.xz
635be6d8a3af371c45d1668fbbdd37e728a6b13d SOURCES/thunderbird-langpacks-102.4.0-20221017.tar.xz
42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg

View File

@ -0,0 +1,11 @@
--- thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py.build-rhel7-lower-node-min-version 2022-10-14 21:42:10.000000000 +0200
+++ thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 18:49:44.490667820 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
from mozfile import which
from six import PY3
-NODE_MIN_VERSION = StrictVersion("10.24.1")
+NODE_MIN_VERSION = StrictVersion("10.24.0")
NPM_MIN_VERSION = StrictVersion("6.14.12")

View File

@ -158,8 +158,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 102.3.0
Release: 4%{?dist}.alma.plus
Version: 102.4.0
Release: 1%{?dist}.alma.alma.plus
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -180,7 +180,7 @@ ExcludeArch: aarch64 s390 ppc
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
%if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20220916.tar.xz
Source1: thunderbird-langpacks-%{version}-20221017.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -214,6 +214,7 @@ Patch73: build-ascii-decode-fail-rhel7.patch
Patch75: build-big-endian-errors.patch
Patch76: firefox-nss-version.patch
Patch77: mozilla-1775202.patch
Patch78: build-rhel7-lower-node-min-version.patch
# Fedora specific patches
Patch215: firefox-enable-addons.patch
@ -576,6 +577,9 @@ echo "use_rustts %{?use_rustts}"
%patch77 -p1 -b .mozilla-1775202
%patch73 -p1 -b .build-ascii-decode-fail-rhel7
%if 0%{?rhel} == 7
%patch78 -p1 -b .build-rhel7-lower-node-min-version
%endif
# Test patches
@ -1224,9 +1228,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Tue Oct 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-4.alma.plus
- Debrand for AlmaLinux
* Tue Oct 25 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.4.0-1.alma.alma.plus
* Tue Oct 25 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.4.0-1.alma
- Debrand for AlmaLinux
* Mon Oct 17 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
- Update to 102.4.0 build1
* Wed Oct 12 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-4
- Fix for expat CVE-2022-40674
* Fri Sep 16 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-3