From 9f8102b786bd89ed49e7f7693c0148155d172fa3 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 5 Feb 2025 13:33:58 +0100 Subject: [PATCH 1/2] Update to 128.2.0 build1 Resolves: RHEL-76262 --- .gitignore | 2 ++ build-cargo-lock-version.patch | 11 +++++++++++ sources | 4 ++-- thunderbird.spec | 15 +++++++++++---- 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 build-cargo-lock-version.patch diff --git a/.gitignore b/.gitignore index 31aeecb..4c9500e 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,5 @@ /thunderbird-langpacks-128.6.0esr-20241218.tar.xz /thunderbird-128.6.0esr.b3.processed-source.tar.xz /thunderbird-langpacks-128.6.0esr-20250108.tar.xz +/thunderbird-128.7.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.7.0esr-20250205.tar.xz diff --git a/build-cargo-lock-version.patch b/build-cargo-lock-version.patch new file mode 100644 index 0000000..a94c27b --- /dev/null +++ b/build-cargo-lock-version.patch @@ -0,0 +1,11 @@ +diff -up thunderbird-128.7.0/comm/rust/Cargo.lock.cargo-lock thunderbird-128.7.0/comm/rust/Cargo.lock +--- thunderbird-128.7.0/comm/rust/Cargo.lock.cargo-lock 2025-02-07 10:14:12.483795636 +0100 ++++ thunderbird-128.7.0/comm/rust/Cargo.lock 2025-02-07 10:14:15.654801697 +0100 +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 4 ++version = 3 + + [[package]] + name = "aa-stroke" diff --git a/sources b/sources index 9246865..59433dd 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.6.0esr.b3.processed-source.tar.xz) = 0fd21416925ba760c55796735f6c83fa51ad1576556b1c4a81b85b31196e55d2cadb0a97be91552283ebe7c2d9d96a902f63ed65a76393f382282e2d0414920d -SHA512 (thunderbird-langpacks-128.6.0esr-20250108.tar.xz) = 4540ca4524548b3ae7513c8fff86fdf12bffd9a89d06cbe89513c2360877b38eb74de5bf4e78170b1b341a4a317748f2c1b77f35a6c7a470f44d2244f5912ac4 +SHA512 (thunderbird-128.7.0esr.processed-source.tar.xz) = c39fe2063ea12e6948336567fbf107d648915f210ab4dc03689a04009cf850ae9f8b76e5586b5758eae9e6739e9034889f86b1df31f66075f2cd580144ae278b +SHA512 (thunderbird-langpacks-128.7.0esr-20250205.tar.xz) = f0e566bf0773f32fc46d7fc5c737149d725e0dcba1d0bf2a2afa5c3030d525d01a38b7a40163cbde0a439073feba110b716befa58420064f13f2114286c1deb9 diff --git a/thunderbird.spec b/thunderbird.spec index a7aa940..c2253ed 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -127,7 +127,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 .b3 %bcond_without langpacks @@ -137,8 +137,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.6.0 -Release: 3%{?dist} +Version: 128.7.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +165,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}-20250108.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250205.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -200,6 +200,7 @@ Patch11: rust-file-removal.patch Patch12: firefox-system-nss-replace-xyber-with-mlkem.patch # Thunderbird has a copy of third_party/rust/neqo-crypto/ in comm/third_party/rust/neqo-crypto/ Patch13: thunderbird-system-nss-replace-xyber-with-mlkem.patch +Patch14: build-cargo-lock-version.patch # -- Upstreamed patches -- Patch51: mozilla-bmo1170092.patch @@ -1071,6 +1072,9 @@ echo "--------------------------------------------" %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif +%if 0%{?rhel} == 8 +%patch -P14 -p1 -b .cargo-lock-version +%endif # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 @@ -1650,6 +1654,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Feb 05 2025 Jan Horak - 128.7.0-1 +- Update to 128.2.0 build1 + * Wed Jan 08 2025 Eike Rathke - 128.6.0-3 - Update to 128.6.0 build3 From dbd08c00ddaf2ced9c1127cae809d1d9f02aadd6 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Fri, 7 Feb 2025 14:24:45 +0100 Subject: [PATCH 2/2] Fixing cargo.lock version build failures on all targets Resolves: RHEL-76262 --- thunderbird.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index c2253ed..09c2cf7 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1072,9 +1072,7 @@ echo "--------------------------------------------" %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif -%if 0%{?rhel} == 8 %patch -P14 -p1 -b .cargo-lock-version -%endif # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092