diff --git a/build-cargo-lock-version.patch b/build-cargo-lock-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..a94c27b7dc847aade1efbb16863bd133469a48ed --- /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/download b/download index b5301d68ec30343efa94bbf5eb8fa237636ba789..608aa1edbbef94fe95e1ab23ce028c949059ebdd 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz -2df189fcfccf74bfc3cba2fc72125fc5 thunderbird-128.6.0esr.b3.processed-source.tar.xz -2d4caf510047aeeb6a638ceb0a54ccb0 thunderbird-langpacks-128.6.0esr-20250108.tar.xz +3ac75a00bdf176e39095e6dc48247677 thunderbird-128.7.0esr.processed-source.tar.xz +94d16c33f4b6e08e2ce7c1e7b358c80e thunderbird-langpacks-128.7.0esr-20250205.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm ab085bce989de91681f48fdd05be4c0f nss-3.101.0-7.el8_2.src.rpm dbf6357877e3e1042de1a95cdfb61507 nss-3.101.0-7.el9_2.src.rpm diff --git a/thunderbird.spec b/thunderbird.spec index 78040be983dfc234994af5cb5303a46f056bcc4d..3f8da073fb9b3363971ae53eff1354327fde0fb1 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -128,7 +128,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 @@ -138,8 +138,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.6.0 -Release: 3%{anolis_release}%{?dist} +Version: 128.7.0 +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -167,7 +167,7 @@ ExcludeArch: loongarch64 #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 @@ -202,6 +202,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 @@ -1074,6 +1075,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 @@ -1653,10 +1657,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Jan 14 2025 Liwei Ge - 128.6.0-3.0.1 +* Wed Feb 12 2025 Liwei Ge - 128.7.0-1.0.1 - Rebrand to Anolis - Remove loongarch64 arch(Zhao Hang) +* 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