From 6f86de075299f4beff70eae014394b90579b086c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 15 Aug 2025 10:41:52 +0200 Subject: [PATCH 1/4] Update to 128.14.0 build1 Resolves: RHEL-108180 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 11 +++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ea13da4..211f66b 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,5 @@ /thunderbird-langpacks-128.13.0esr-20250722.tar.xz /thunderbird-128.13.0esr.b3.processed-source.tar.xz /thunderbird-langpacks-128.13.0esr-20250723.tar.xz +/thunderbird-128.14.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.14.0esr-20250815.tar.xz diff --git a/sources b/sources index b4ffc8b..c9fa23c 100644 --- a/sources +++ b/sources @@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d -SHA512 (thunderbird-128.13.0esr.b3.processed-source.tar.xz) = f68b310c8623ebcf3c296569d18300d329fed7164448b1422e9ed203834d32f0b2b549b2dc1f20d0ce7176f8616ef8ec17fe3a74963dc1c78951340b0ed77ffe -SHA512 (thunderbird-langpacks-128.13.0esr-20250723.tar.xz) = cb866a5f93ef3f9bcc0d23de9ac0859fef5884edc353895c5bf1c5ed6d90d1148f137c86c19b9c7d6381eafa7fe8a689f0c7ead652ba4fadb3c55e4ea038a2a8 +SHA512 (thunderbird-128.14.0esr.processed-source.tar.xz) = fd773dc0b156c6d3f847ae2e4670600d41091c9374d2cd787a246ef24a209eff70953f36e7e04903ec908cf47367b5a98c11019dec52eeca2890794c7a4f2ed9 +SHA512 (thunderbird-langpacks-128.14.0esr-20250815.tar.xz) = 3e4c496e9c7c1764b904d1fd1f702da016e5f7a82b12afa7ad9b2f4fd91b71c43211a39016bffbceeaeb144273e4c9afc2e28fe196981663d42f14378f96706b diff --git a/thunderbird.spec b/thunderbird.spec index 5331c41..4e82719 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -135,7 +135,7 @@ end} # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # thunderbird-102.8.0.b2.processed-source.tar.xz # When unset use processed source file name as is. -%global buildnum .b3 +##global buildnum .b2 %bcond_without langpacks @@ -145,8 +145,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.13.0 -Release: 3%{?dist} +Version: 128.14.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250723.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250815.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1670,6 +1670,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Aug 15 2025 Jan Grulich - 128.14.0-1 +- Update to 128.14.0 build1 + * Wed Jul 23 2025 Eike Rathke - 128.13.0-3 - Update to 128.13.0 build3 From 830d6ff5367c04f47a270fe38248f611cca556d3 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 15 Aug 2025 15:10:06 +0200 Subject: [PATCH 2/4] Add missing translations Related: RHEL-108180 --- sources | 2 +- thunderbird.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c9fa23c..c228770 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d SHA512 (thunderbird-128.14.0esr.processed-source.tar.xz) = fd773dc0b156c6d3f847ae2e4670600d41091c9374d2cd787a246ef24a209eff70953f36e7e04903ec908cf47367b5a98c11019dec52eeca2890794c7a4f2ed9 -SHA512 (thunderbird-langpacks-128.14.0esr-20250815.tar.xz) = 3e4c496e9c7c1764b904d1fd1f702da016e5f7a82b12afa7ad9b2f4fd91b71c43211a39016bffbceeaeb144273e4c9afc2e28fe196981663d42f14378f96706b +SHA512 (thunderbird-langpacks-128.14.0esr-20250815.tar.xz) = 97cef2ac7e65872345aa68514752f83b051827a1d6627efca5f43837da4a109c9a994d49f80e8fb75a1a0f3c2b09eb4ff9551f2187943bcf10716bae5406f225 diff --git a/thunderbird.spec b/thunderbird.spec index 4e82719..2d44656 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -146,7 +146,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.14.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -1670,6 +1670,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Aug 15 2025 Jan Grulich - 128.14.0-2 +- Add missing translations + * Fri Aug 15 2025 Jan Grulich - 128.14.0-1 - Update to 128.14.0 build1 From 4e8706f329c95179a427978e0216aeb2224d358f Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 19 Aug 2025 10:00:15 +0200 Subject: [PATCH 3/4] Update to 128.14.0 build2 Resolves: RHEL-108180 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 211f66b..06064a3 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,5 @@ /thunderbird-langpacks-128.13.0esr-20250723.tar.xz /thunderbird-128.14.0esr.processed-source.tar.xz /thunderbird-langpacks-128.14.0esr-20250815.tar.xz +/thunderbird-langpacks-128.14.0esr-20250819.tar.xz +/thunderbird-128.14.0esr.b2.processed-source.tar.xz diff --git a/sources b/sources index c228770..9fa0942 100644 --- a/sources +++ b/sources @@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d -SHA512 (thunderbird-128.14.0esr.processed-source.tar.xz) = fd773dc0b156c6d3f847ae2e4670600d41091c9374d2cd787a246ef24a209eff70953f36e7e04903ec908cf47367b5a98c11019dec52eeca2890794c7a4f2ed9 -SHA512 (thunderbird-langpacks-128.14.0esr-20250815.tar.xz) = 97cef2ac7e65872345aa68514752f83b051827a1d6627efca5f43837da4a109c9a994d49f80e8fb75a1a0f3c2b09eb4ff9551f2187943bcf10716bae5406f225 +SHA512 (thunderbird-128.14.0esr.b2.processed-source.tar.xz) = c9a1a389e926f2ad6435f10a296efcbf045d4e6721e19e388dcc052f8efbc2998d50d4a1c6156bdd6163d1ca7ebcc59605cadd926a9a0406ef67851565f5fb57 +SHA512 (thunderbird-langpacks-128.14.0esr-20250819.tar.xz) = a889b970fb4dabbfda95f40264caeafa458ff8244f179ee8968eff04641351259d525ee6461289e2a06855e136103729206e51c3eeae336d010cac7e2620a08e diff --git a/thunderbird.spec b/thunderbird.spec index 2d44656..64b2de2 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -135,7 +135,7 @@ end} # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # thunderbird-102.8.0.b2.processed-source.tar.xz # When unset use processed source file name as is. -##global buildnum .b2 +%global buildnum .b2 %bcond_without langpacks @@ -146,7 +146,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.14.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250815.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250819.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1670,6 +1670,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Aug 19 2025 Jan Grulich - 128.14.0-3 +- Update to 128.14.0 build2 + * Fri Aug 15 2025 Jan Grulich - 128.14.0-2 - Add missing translations From f864b6a156d95f1addc49612005e625faa717f38 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 27 Aug 2025 09:22:54 +0200 Subject: [PATCH 4/4] NSS 3.112 is currently only in c10s so apply system NSS patch only there Related: RHEL-108180 --- thunderbird.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 64b2de2..8e4e996 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1081,7 +1081,7 @@ echo "--------------------------------------------" %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif %patch -P14 -p1 -b .cargo-lock-version -%if %{?system_nss} +%if %{?system_nss} && 0%{?centos} == 10 %patch -P15 -p1 -b .system-nss %endif @@ -1679,6 +1679,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Fri Aug 15 2025 Jan Grulich - 128.14.0-1 - Update to 128.14.0 build1 +* Tue Aug 05 2025 Tomas Popela - 128.13.0-4 +- Bump the NSS requirements as the rebased NSS is already shipped in c10s + * Wed Jul 23 2025 Eike Rathke - 128.13.0-3 - Update to 128.13.0 build3 @@ -1697,9 +1700,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon May 19 2025 Eike Rathke - 128.10.1-1 - Update to 128.10.1 -* Tue Aug 05 2025 Tomas Popela - 128.10.0-2 -- Bump the NSS requirements as the rebased NSS is already shipped in c10s - * Mon Apr 28 2025 Eike Rathke - 128.10.0-1 - Update to 128.10.0 build1