import CS git thunderbird-140.13.0-1.el9_8
This commit is contained in:
AlmaLinux RelEng Bot
parent
ab918cf1ca
commit
8be775a8d0
4
.gitignore
vendored
4
.gitignore
vendored
@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz
|
||||
SOURCES/nspr-4.36.0-2.el8_2.src.rpm
|
||||
SOURCES/nss-3.112.0-1.el9_4.src.rpm
|
||||
SOURCES/nss-3.112.0-4.el8_2.src.rpm
|
||||
SOURCES/thunderbird-140.12.0esr.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-140.12.0esr-20260615.tar.xz
|
||||
SOURCES/thunderbird-140.13.0esr.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-140.13.0esr-20260722.tar.xz
|
||||
|
||||
@ -2,5 +2,5 @@ bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz
|
||||
0d0ddbd2a73340b3cbc977997f57222946b1e775 SOURCES/nspr-4.36.0-2.el8_2.src.rpm
|
||||
fd3879b176634d66f8ef64d18fdaeec98e140c23 SOURCES/nss-3.112.0-1.el9_4.src.rpm
|
||||
c3f0aaef37972107442e2796efad71be3a98ce3c SOURCES/nss-3.112.0-4.el8_2.src.rpm
|
||||
bac9da3993145ee5b8f6c67d8bb00cf3b8fd38a6 SOURCES/thunderbird-140.12.0esr.processed-source.tar.xz
|
||||
7569b6c73154365395dd788ed263e1e95efe9591 SOURCES/thunderbird-langpacks-140.12.0esr-20260615.tar.xz
|
||||
ad9ce6d59db48c056392ea7912946dc714a5356d SOURCES/thunderbird-140.13.0esr.processed-source.tar.xz
|
||||
7b800cd85a6de40117b8b59768b4fbdfef64fbe3 SOURCES/thunderbird-langpacks-140.13.0esr-20260722.tar.xz
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
|
||||
end
|
||||
match = string.match(str, ".el9")
|
||||
if match then
|
||||
return 7
|
||||
return 9
|
||||
end
|
||||
match = string.match(str, ".el10_%d+")
|
||||
if match then
|
||||
@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start)
|
||||
end
|
||||
match = string.match(str, ".el10")
|
||||
if match then
|
||||
return 1
|
||||
return 3
|
||||
end
|
||||
return -1
|
||||
end}
|
||||
@ -75,6 +75,14 @@ end}
|
||||
%global nspr_version_max 4.37
|
||||
%global nss_version 3.112
|
||||
%global nss_version_max 3.113
|
||||
%if 0%{?rhel} >= 10 && 0%{?rhel_minor_version} > 2
|
||||
%global nss_version_max 3.125
|
||||
%global nspr_version_max 4.40
|
||||
%endif
|
||||
%if 0%{?rhel} == 9 && 0%{?rhel_minor_version} > 8
|
||||
%global nss_version_max 3.125
|
||||
%global nspr_version_max 4.40
|
||||
%endif
|
||||
%global rust_version 1.84
|
||||
%global system_libvpx 0
|
||||
|
||||
@ -88,7 +96,7 @@ end}
|
||||
|
||||
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
|
||||
%global use_gcc_ts 1
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 8) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
|
||||
# clang depends on gcc-toolset-14-gcc-c++
|
||||
%global gts_version 14
|
||||
%else
|
||||
@ -137,7 +145,7 @@ end}
|
||||
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 140.12.0
|
||||
Version: 140.13.0
|
||||
Release: 1%{?dist}
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
@ -165,7 +173,7 @@ ExcludeArch: %{ix86}
|
||||
#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}%{?buildnum}.processed-source.tar.xz
|
||||
%if %{with langpacks}
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20260615.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20260722.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -208,7 +216,6 @@ Patch20: build-bindgen-0.72.1.patch
|
||||
Patch51: mozilla-bmo1170092.patch
|
||||
Patch52: exceptionHandled-for-IO-error-processhandler.patch
|
||||
|
||||
|
||||
# -- Submitted upstream, not merged --
|
||||
Patch102: mozilla-bmo1670333.patch
|
||||
# Big endian fix
|
||||
@ -238,6 +245,7 @@ Patch123: thunderbird-adapt-ml-dsa-support-to-rhel-nss.patch
|
||||
Patch124: thunderbird-enable-ml-dsa-in-manager-ssl.patch
|
||||
# RHEL downstream only - add mlkem768-secp256r1 support
|
||||
Patch125: thunderbird-add-mlkem768-secp256r1-support.patch
|
||||
Patch126: thunderbird-add-mlkem768-secp256r1-support-nss-3.124.patch
|
||||
|
||||
# ---- Fedora specific patches ----
|
||||
Patch151: firefox-enable-addons.patch
|
||||
@ -352,6 +360,7 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
|
||||
BuildRequires: gcc-toolset-%{gts_version}-binutils
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
|
||||
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
|
||||
# when clang is upgraded to depend on a later toolset and adjust version.
|
||||
# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
|
||||
@ -1101,14 +1110,27 @@ echo "--------------------------------------------"
|
||||
%endif
|
||||
%patch -P11 -p1 -b .rust-file-removal
|
||||
%patch -P14 -p1 -b .cargo-lock-version
|
||||
%patch -P15 -p1 -b .build-system-nss
|
||||
%patch -P16 -p1 -b .tb-build-system-nss
|
||||
|
||||
%if %{?system_nss}
|
||||
%if (0%{?rhel} == 10 && %{rhel_minor_version} <= 2)
|
||||
%patch -P15 -p1 -b .build-system-nss
|
||||
%patch -P16 -p1 -b .tb-build-system-nss
|
||||
%endif
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} <= 8)
|
||||
%patch -P15 -p1 -b .build-system-nss
|
||||
%patch -P16 -p1 -b .tb-build-system-nss
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%patch -P18 -p1 -b .annobin-fix
|
||||
%patch -P19 -p1 -b .min-lexical
|
||||
|
||||
%if (0%{?rhel} == 10 && %{rhel_minor_version} > 2)
|
||||
%patch -P20 -p1 -b .bindgen-llvm22
|
||||
%endif
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} > 8)
|
||||
%patch -P20 -p1 -b .bindgen-llvm22
|
||||
%endif
|
||||
|
||||
# -- Upstreamed patches --
|
||||
%patch -P51 -p1 -b .mozilla-bmo1170092
|
||||
@ -1133,9 +1155,17 @@ echo "--------------------------------------------"
|
||||
%patch -P120 -p1 -b .integrate-ml-dsa-signature-verification-for-pkix-certificate-chain-validation
|
||||
%patch -P121 -p1 -b .add-ml-dsa-certificate-support-to-certviewer
|
||||
%patch -P122 -p1 -b .enable-ml-dsa-signature-verification-for-certificate-chain-validation
|
||||
%if 0%{?rhel_minor_version} <= 2
|
||||
%patch -P123 -p1 -b .adapt-ml-dsa-support-to-rhel-nss
|
||||
%endif
|
||||
%patch -P124 -p1 -b .enable-ml-dsa-in-manager-ssl
|
||||
|
||||
%if 0%{?rhel_minor_version} <= 2
|
||||
%patch -P125 -p1 -b .add-mlkem768-secp256r1-support
|
||||
%else
|
||||
%patch -P126 -p1 -b .add-mlkem768-secp256r1-support-nss-3.124
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
# ---- Fedora specific patches ----
|
||||
@ -1723,6 +1753,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Wed Jul 22 2026 Jan Horak <jhorak@redhat.com> - 140.13.0-1
|
||||
- Update to 140.13.0 ESR
|
||||
|
||||
* Mon Jun 15 2026 Jan Horak <jhorak@redhat.com> - 140.12.0-1
|
||||
- Update to 140.12.0 ESR
|
||||
|
||||
@ -1786,6 +1819,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
* Mon May 19 2025 Eike Rathke <erack@redhat.com> - 128.10.1-1
|
||||
- Update to 128.10.1
|
||||
|
||||
* Tue Aug 05 2025 Tomas Popela <tpopela@redhat.com> - 128.10.0-2
|
||||
- Bump the NSS requirements as the rebased NSS is already shipped in c10s
|
||||
|
||||
* Mon Apr 28 2025 Eike Rathke <erack@redhat.com> - 128.10.0-1
|
||||
- Update to 128.10.0 build1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user