From ce9f8fe72eaec0d117a4db4fab3db81373e99699 Mon Sep 17 00:00:00 2001
From: yangxianzhao <yangxianzhao@uniontech.com>
Date: Tue, 18 Apr 2023 10:27:26 +0800
Subject: [PATCH] rebrand to anolis and fix build error

---
 download                                      |  1 +
 ....js => thunderbird-anolis-default-prefs.js |  2 +-
 thunderbird.spec                              | 39 ++++++++++++++-----
 3 files changed, 32 insertions(+), 10 deletions(-)
 rename thunderbird-centos-default-prefs.js => thunderbird-anolis-default-prefs.js (96%)

diff --git a/download b/download
index 2797caa..70b3613 100644
--- a/download
+++ b/download
@@ -3,3 +3,4 @@ a9f32342fcac2b79f76860ee742d6ff1  cbindgen-vendor.tar.xz
 e7991f43d99938d9ac6cad51cd91bd3b  thunderbird-102.10.0.b2.processed-source.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 c27d9d3..1d192b1 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 d2f2df9..9813d39 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.10.0
-Release:        2%{?dist}
+Release:        2%{anolis_release}%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -187,7 +188,7 @@ ExcludeArch:    %{ix86}
   %endif
 %endif
 %if 0%{?rhel} == 7
-ExcludeArch:    aarch64 s390 ppc
+ExcludeArch:    s390 ppc
 %endif
 
 #Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
@@ -198,7 +199,7 @@ Source1:        thunderbird-langpacks-%{version}-20230411.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-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
@@ -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 <<EOL
+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 <<EOL
 [source.crates-io]
 replace-with = "vendored-sources"
 
@@ -864,8 +881,8 @@ EOL
 #export RUSTFLAGS="-Cdebuginfo=0 -Clinker=/opt/rh/gcc-toolset-12/root/usr/bin/gcc"
 %endif
 
-env CARGO_HOME=.cargo cargo install cbindgen
-export PATH=`pwd`/.cargo/bin:$PATH
+#env CARGO_HOME=.cargo cargo install cbindgen
+#export PATH=`pwd`/.cargo/bin:$PATH
 cd -
 %endif
 
@@ -1255,6 +1272,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Apr 18 2023 yangxianzhao <yangxianzhao@uniontech.com> - 102.10.0-2.0.1
+- rebrand: rebrand for anolis
+- fix an7 compile problem 
+
 * Mon Apr 17 2023 CentOS Sources <bugs@centos.org> - 102.10.0-2.el7.centos
 - rebrand default prefs
 
-- 
Gitee