diff --git a/download b/download index 977761004837e9fc6085516610c31aed6c09ceef..438e9ee0ac30925dc1121bcbaecfc8646656fc48 100644 --- a/download +++ b/download @@ -3,3 +3,4 @@ a9f32342fcac2b79f76860ee742d6ff1 cbindgen-vendor.tar.xz 4b55aff10d8918c0d9ceef6409e1279d thunderbird-langpacks-102.14.0-20230801.tar.xz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm b603172c3f4cbb1d8197328087ca3972 nss-3.79.0-11.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 bbc3a7fe1dc1c6a2119079415a61a47c86441659..40dd1ecef27233eebd41b98f6d4cc24b24648494 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 @@ -120,7 +121,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 @@ -184,7 +185,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 102.14.0 -Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -216,7 +217,7 @@ Source1: thunderbird-langpacks-%{version}-20230801.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 @@ -227,6 +228,8 @@ Source35: google-loc-api-key Source403: nss-3.79.0-11.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 @@ -349,7 +352,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} @@ -871,8 +874,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 Aug 17 2023 yangxianzhao - 102.14.0-3.0.1 +- rebrand: rebrand to anolis +- fix build error + * Wed Aug 09 2023 CentOS Sources - 102.14.0-3.el7.centos - rebrand default prefs