AlmaLinux changes

.gitignore

@@ -1,6 +1,6 @@
-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
+cbindgen-vendor.tar.xz
+nspr-4.36.0-2.el8_2.src.rpm
+nss-3.112.0-1.el9_4.src.rpm
+nss-3.112.0-4.el8_2.src.rpm
+thunderbird-140.13.0esr.processed-source.tar.xz
+thunderbird-langpacks-140.13.0esr-20260722.tar.xz

.thunderbird.metadata

@@ -1,6 +0,0 @@
-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

sources

@@ -0,0 +1,6 @@
+SHA512 (cbindgen-vendor.tar.xz) = 2b8db32c0bca2fa27304ee4fd3a5cc38bc43a11500b23842747813d221e55719c51cf4c0e027e41857f58ce1e283ce97b69c2c7d1eae93ecbb08c2f729e2bf55
+SHA512 (nspr-4.36.0-2.el8_2.src.rpm) = fcc720afd2453a5110975fac9dd06f636491234780b62cbfcc235a485b4935e97c4f438292c686d27d9dc86b56f43399c024bee4fffcdff5f27c62d105310645
+SHA512 (nss-3.112.0-1.el9_4.src.rpm) = 6386239e79f8095b05270b3c8b76ac9203b0df196921b64b779f832f0c04fc8c86624a98d85d39372b07e361278c400f52ef653e14ebeab9db49429e69153ff2
+SHA512 (nss-3.112.0-4.el8_2.src.rpm) = 59cca3df7a0ec6a731f4a36f8f560d496d240da0c16650f047ae686e683b883dc2630aedbe46a8b2cb21662c15f03f1efbe99da42055cc3a5418da4839e28da2
+SHA512 (thunderbird-140.13.0esr.processed-source.tar.xz) = 6134b1ea7e1752cc058a75eadbad36ea6d5a9fbf9a5a78829cd7b31f264fd258b592f4f49aca3e7820edca47116be8a223ca7addb23722a328983b8ad99dd8de
+SHA512 (thunderbird-langpacks-140.13.0esr-20260722.tar.xz) = 62ce94eef8e01234fb19372232c921a9173c4bb419f882ef7b42b66874f57cb3897cd60ad24d7c31be4dd5223bb914b53d0e24d1dc7b78cb39c53836a1327dee

thunderbird.spec

@@ -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
 
@@ -137,7 +145,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        140.12.0
+Version:        140.13.0
 Release:        1%{?dist}.alma.1
 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
@@ -1101,8 +1109,18 @@ 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
 
@@ -1133,9 +1151,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,9 +1749,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon Jun 22 2026 Eduard Abdullin <eabdullin@almalinux.org> - 140.12.0-1.alma.1
+* Mon Aug 03 2026 Eduard Abdullin <eabdullin@almalinux.org> - 140.13.0-1.alma.1
 - AlmaLinux changes
 
+* 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
 
@@ -1771,6 +1800,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Aug 15 2025 Jan Grulich <jgrulich@redhat.com> - 128.14.0-1
 - Update to 128.14.0 build1
 
+* Tue Aug 05 2025 Tomas Popela <tpopela@redhat.com> - 128.13.0-4
+- Bump the NSS requirements as the rebased NSS is already shipped in c10s
+
 * Wed Jul 23 2025 Eike Rathke <erack@redhat.com> - 128.13.0-3
 - Update to 128.13.0 build3