From 7429f3bbe665b3595bd00e853703e54d99c8177f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 12 Feb 2025 03:02:52 +0300 Subject: [PATCH] import thunderbird-128.7.0-1.el8_10 --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SOURCES/build-cargo-lock-version.patch | 11 +++++++++++ SPECS/thunderbird.spec | 15 +++++++++++---- 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 SOURCES/build-cargo-lock-version.patch diff --git a/.gitignore b/.gitignore index d3046d2..1002d1c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm SOURCES/nss-3.101.0-7.el9_2.src.rpm -SOURCES/thunderbird-128.6.0esr.b3.processed-source.tar.xz -SOURCES/thunderbird-langpacks-128.6.0esr-20250108.tar.xz +SOURCES/thunderbird-128.7.0esr.processed-source.tar.xz +SOURCES/thunderbird-langpacks-128.7.0esr-20250205.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index efe64c4..61f48ed 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -2,5 +2,5 @@ d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm 0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm -4916a32548cf7e7a8b4a549d32400be705a902b8 SOURCES/thunderbird-128.6.0esr.b3.processed-source.tar.xz -8f7dbc49655582a51e5567a8a66ea2aecd064b7f SOURCES/thunderbird-langpacks-128.6.0esr-20250108.tar.xz +d06200332d67c0891116d3d151d7ab6765c069a5 SOURCES/thunderbird-128.7.0esr.processed-source.tar.xz +11caf86fe97c67bd3e64279051e6f0ca793a86de SOURCES/thunderbird-langpacks-128.7.0esr-20250205.tar.xz diff --git a/SOURCES/build-cargo-lock-version.patch b/SOURCES/build-cargo-lock-version.patch new file mode 100644 index 0000000..a94c27b --- /dev/null +++ b/SOURCES/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/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index a7aa940..c2253ed 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/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