diff --git a/download b/download index 99b84041a4352133804d7c65c26e6db15f32f8ab..d8e4acd8a6935e73c7737a617d756d13a38389c0 100644 --- a/download +++ b/download @@ -3,3 +3,4 @@ d8db565cd6d1271dc5e87384aebdaa05 thunderbird-102.9.0.processed-source.tar.xz 409f94ae1e130bdeda08bf87106c465e thunderbird-langpacks-102.9.0-20230313.tar.xz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm 04f69b8baa7bd8ddc49d786b04307df8 nss-3.79.0-6.el8_1.src.rpm +f5186eae0d0728e2cdcb6c26cd7d658e rust-cbindgen.tar.gz diff --git a/thunderbird-centos-default-prefs.js b/thunderbird-anolis-default-prefs.js similarity index 96% rename from thunderbird-centos-default-prefs.js rename to thunderbird-anolis-default-prefs.js index c27d9d31f6758c227fa7cdd781bbc51cfffd2054..1d192b118c3400135cd8897caa6ecbc6cc25feba 100644 --- a/thunderbird-centos-default-prefs.js +++ b/thunderbird-anolis-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", "CentOS"); +pref("general.useragent.vendor", "Anolis"); 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 82566199b21353f15b49df641a779a76a37a397c..e6a041c70406dcf2ead56c041af409fdcda4e9d1 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Set for local builds only %global disable_toolsets 0 @@ -102,7 +103,7 @@ end} %endif %global use_rustts 1 %global dts_version 10 -%global rust_version 1.62 +#%global rust_version 1.62 %if 0%{?rhel} >= 8 %global use_rustts 0 %endif @@ -166,7 +167,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 102.9.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -198,7 +199,7 @@ Source1: thunderbird-langpacks-%{version}-20230313.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-centos-default-prefs.js +Source12: thunderbird-anolis-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -209,6 +210,7 @@ Source35: google-loc-api-key Source403: nss-3.79.0-6.el8_1.src.rpm Source401: nss-setup-flags-env.inc Source402: nspr-4.34.0-3.el8_1.src.rpm +Source404: rust-cbindgen.tar.gz # Build patches Patch3: mozilla-build-arm.patch @@ -331,7 +333,7 @@ BuildRequires: rustfmt >= %{rust_version} %endif %if 0%{?use_rustts} -BuildRequires: rust-toolset-%{rust_version} +#BuildRequires: rust-toolset-%{rust_version} %endif %if 0%{?use_llvmts} @@ -851,8 +853,23 @@ which node mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -mkdir -p .cargo -cat > .cargo/config < %{_buildrootdir}/cargo/config </dev/null || : #=============================================================================== %changelog +* Thu Mar 23 2023 yangxianzhao 102.9.0-1.0.1 +- rebrand: rebrand for anolis +- fix an7 compile problem + * Wed Mar 22 2023 CentOS Sources - 102.9.0-1.el7.centos - rebrand default prefs