From eec5aa15398f7a674d7981eac230fccf0f527b6c Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Tue, 12 Mar 2024 13:35:39 +0800 Subject: [PATCH] Update to thunderbird-115.6.0-1.el7_9 --- build-rhel7-lower-node-min-version.patch | 12 ++--- download | 5 +- ....js => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 48 +++++-------------- 4 files changed, 20 insertions(+), 47 deletions(-) rename thunderbird-anolis-default-prefs.js => thunderbird-redhat-default-prefs.js (96%) diff --git a/build-rhel7-lower-node-min-version.patch b/build-rhel7-lower-node-min-version.patch index 398cbc3..2bb39c8 100644 --- a/build-rhel7-lower-node-min-version.patch +++ b/build-rhel7-lower-node-min-version.patch @@ -1,11 +1,11 @@ ---- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2024-02-12 21:53:56.000000000 +0200 -+++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py 2024-02-14 16:48:12.476182627 +0200 +--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200 ++++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200 @@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir - from packaging.version import Version + from mozfile import which from six import PY3 --NODE_MIN_VERSION = Version("12.22.12") -+NODE_MIN_VERSION = Version("10.24.0") - NPM_MIN_VERSION = Version("6.14.16") +-NODE_MIN_VERSION = StrictVersion("12.22.12") ++NODE_MIN_VERSION = StrictVersion("10.24.0") + NPM_MIN_VERSION = StrictVersion("6.14.16") diff --git a/download b/download index 10cba4f..de7b740 100644 --- a/download +++ b/download @@ -2,6 +2,5 @@ 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm d9c9dd9619daeb43820de97b04bede45 nss-3.90.0-2.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm -38fb281ac55e8e78207cd434e1c3aa12 thunderbird-115.8.0.processed-source.tar.xz -3eebf3a9f1a357ace6d347a9e8c8c7a2 thunderbird-langpacks-115.8.0-20240219.tar.xz -6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz +ad88f36c797d35458312c7e293449ef7 thunderbird-115.6.0.processed-source.tar.xz +2af5ce8292bb573fac54952ed212f91b thunderbird-langpacks-115.6.0-20231218.tar.xz diff --git a/thunderbird-anolis-default-prefs.js b/thunderbird-redhat-default-prefs.js similarity index 96% rename from thunderbird-anolis-default-prefs.js rename to thunderbird-redhat-default-prefs.js index 1d192b1..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js +++ b/thunderbird-redhat-default-prefs.js @@ -2,7 +2,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); /* Allow users to set custom colors*/ /* pref("browser.display.use_system_colors", true);*/ -pref("general.useragent.vendor", "Anolis"); +pref("general.useragent.vendor", "Red Hat"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); diff --git a/thunderbird.spec b/thunderbird.spec index d27142d..eeb2fd2 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Set for local builds only %global disable_toolsets 0 @@ -68,7 +67,7 @@ end} %global nspr_version_max 4.36 %global nss_version 3.90 %global nss_version_max 3.91 -#%global rust_version 1.66 +%global rust_version 1.66 %global system_libvpx 0 # Toolsets setup @@ -135,8 +134,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.8.0 -Release: 1%{anolis_release}%{?dist} +Version: 115.6.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -156,7 +155,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc ppc64 +ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -166,12 +165,12 @@ ExcludeArch: s390 ppc ppc64 #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}-20240219.tar.xz +Source1: thunderbird-langpacks-%{version}-20231218.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-anolis-default-prefs.js +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -183,7 +182,6 @@ Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm Source403: nss-3.90.0-2.el8_1.src.rpm Source404: nss-3.90.0-3.el9_0.src.rpm -Source405: rust-cbindgen.tar.gz # ---- RHEL specific patches --- # -- Downstream only -- @@ -317,7 +315,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_rust_ts} -#BuildRequires: rust-toolset-%{rust_version} +BuildRequires: rust-toolset-%{rust_version} %endif # Bundled nss/nspr requirement @@ -1151,23 +1149,8 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -cd .. -mkdir rust-cbindgen -cd rust-cbindgen -%{__tar} xf %{SOURCE405} -mkdir -p %{_buildrootdir}/cargo -export CACHE_DIR=%{_buildrootdir}/cargo -CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR -%ifarch aarch64 -cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR -%endif -%ifarch x86_64 -cp -r rust-cbindgen/rust-cbindgen-x86_64/* $CACHE_DIR -%endif -export PATH=$CACHE_DIR/bin/:$PATH -export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH -rustc --version -cat > %{_buildrootdir}/cargo/config < .cargo/config </dev/null || : #=============================================================================== %changelog -* Tue Mar 05 2024 yangxianzhao - 115.8.0-1.0.1 -- rebrand to anolis - -* Mon Feb 19 2024 Eike Rathke - 115.8.0-1 -- Update to 115.8.0 build1 - -* Mon Jan 22 2024 Eike Rathke - 115.7.0-1 -- Update to 115.7.0 build1 - * Mon Dec 18 2023 Eike Rathke - 115.6.0-1 - Update to 115.6.0 build2 -- Gitee