From 3310d130c1f468a7f55579b6457420c73133f64e Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Tue, 20 Feb 2024 15:55:05 +0800 Subject: [PATCH] Update to thunderbird-115.5 --- download | 5 +- ....js => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 59 ++++++++----------- 3 files changed, 29 insertions(+), 37 deletions(-) rename thunderbird-anolis-default-prefs.js => thunderbird-redhat-default-prefs.js (96%) diff --git a/download b/download index 941d855..0e748e7 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 -16f8a8028a91c36f00a627fe6f6d9d71 thunderbird-115.4.1.processed-source.tar.xz -ac368733170f92a751093993784077c5 thunderbird-langpacks-115.4.1-20231025.tar.xz -6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz +322656f39a60b5bd18cc6726ad061657 thunderbird-115.5.0.processed-source.tar.xz +bf109bcf39465089906ba1df6f8041d0 thunderbird-langpacks-115.5.0-20231121.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 2573316..d71c4df 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,6 +1,4 @@ # Set for local builds only -%define anolis_release .0.1 - %global disable_toolsets 0 # Produce debug (non-optimized) package build. Suitable for debugging only @@ -69,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 @@ -136,8 +134,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.4.1 -Release: 1%{anolis_release}%{?dist} +Version: 115.5.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -145,14 +143,19 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + # Started to ship on aarch64 in RHEL 8.2, on s390x in RHEL 8.3 %if %{rhel_minor_version} == 1 -ExcludeArch: %{ix86} aarch64 s390x +ExcludeArch: %{ix86} s390x aarch64 %else + %if %{rhel_minor_version} == 2 +ExcludeArch: %{ix86} s390x + %else ExcludeArch: %{ix86} + %endif %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc ppc64 %endif # We can't use the official tarball as it contains some test files that use @@ -162,12 +165,12 @@ ExcludeArch: s390 ppc #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}-20231025.tar.xz +Source1: thunderbird-langpacks-%{version}-20231121.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 @@ -179,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 -- @@ -313,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 @@ -1017,6 +1019,13 @@ echo "ac_add_options --with-mozilla-api-keyfile=`pwd`/mozilla-api-key" >> .mozco echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc-api-key" >> .mozconfig echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig +# May result in empty --with-libclang-path= in earlier versions. +# So far this is needed only for c8s. +%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 +# Clang 17 upstream's detection fails, tell it where to look. +echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig +%endif + echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig # Remove executable bit to make brp-mangle-shebangs happy. @@ -1140,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 -* Thu Nov 23 2023 yangxianzhao - 115.4.1-1.0.1 -- rebrand to anolis -- fix build error +* Tue Nov 21 2023 Eike Rathke - 115.5.0-1 +- Update to 115.5.0 build1 * Wed Oct 25 2023 Eike Rathke - 115.4.1-1 - Update to 115.4.1 build1 -- Gitee