diff --git a/download b/download index 1d196dda7331f8ac93a087dce0d6219f3ea9ba62..203469b7aeed16595c73987480917a42c87ca9e5 100644 --- a/download +++ b/download @@ -3,4 +3,3 @@ a9f32342fcac2b79f76860ee742d6ff1 cbindgen-vendor.tar.xz b95f3d79d9d95cf6c1562ca9ffa7191b thunderbird-langpacks-102.15.0-20230828.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-anolis-default-prefs.js b/thunderbird-centos-default-prefs.js similarity index 96% rename from thunderbird-anolis-default-prefs.js rename to thunderbird-centos-default-prefs.js index 1d192b118c3400135cd8897caa6ecbc6cc25feba..c27d9d31f6758c227fa7cdd781bbc51cfffd2054 100644 --- a/thunderbird-anolis-default-prefs.js +++ b/thunderbird-centos-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", "CentOS"); 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 745b09095db3e74dad45247a0391a9ddffb76267..3af29f7ff5169468fd302e95a6d4d4e97a4b2338 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 @@ -121,7 +120,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 @@ -185,7 +184,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 102.15.0 -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -217,7 +216,7 @@ Source1: thunderbird-langpacks-%{version}-20230828.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-anolis-default-prefs.js +Source12: thunderbird-centos-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -228,7 +227,6 @@ 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 @@ -351,7 +349,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} @@ -873,23 +871,8 @@ which node mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -cd .. -mkdir rust-cbindgen -cd rust-cbindgen -%{__tar} xf %{SOURCE404} -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 -* Wed Sep 06 2023 yangxianzhao - 102.15.0-1.0.1 -- rebrand: rebrand to anolis -- fix build error - * Mon Sep 04 2023 CentOS Sources - 102.15.0-1.el7.centos - rebrand default prefs