From d9ddae781f64c4fcaabcd2d97640134fa27e4074 Mon Sep 17 00:00:00 2001
From: yangxianzhao <yangxianzhao@uniontech.com>
Date: Tue, 5 Mar 2024 15:02:19 +0800
Subject: [PATCH] rebrand to anolis

---
 ....js => thunderbird-anolis-default-prefs.js |  2 +-
 thunderbird.spec                              | 36 ++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)
 rename thunderbird-redhat-default-prefs.js => thunderbird-anolis-default-prefs.js (96%)

diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-anolis-default-prefs.js
similarity index 96%
rename from thunderbird-redhat-default-prefs.js
rename to thunderbird-anolis-default-prefs.js
index 4d01b78..1d192b1 100644
--- a/thunderbird-redhat-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", "Red Hat");
+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 dfed44d..d27142d 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
 
@@ -67,7 +68,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
@@ -135,7 +136,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.8.0
-Release:        1%{?dist}
+Release:        1%{anolis_release}%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -170,7 +171,7 @@ Source1:        thunderbird-langpacks-%{version}-20240219.tar.xz
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
 Source10:       thunderbird-mozconfig
-Source12:       thunderbird-redhat-default-prefs.js
+Source12:       thunderbird-anolis-default-prefs.js
 Source20:       thunderbird.desktop
 Source21:       thunderbird.sh.in
 Source24:       mozilla-api-key
@@ -182,6 +183,7 @@ 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 --
@@ -315,7 +317,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
@@ -1149,8 +1151,23 @@ which python3
 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 %{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 <<EOL
 [source.crates-io]
 replace-with = "vendored-sources"
 
@@ -1162,8 +1179,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 -
 
 # end of Bundled cbindgen
@@ -1514,6 +1531,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Mar 05 2024 yangxianzhao <yangxianzhao@uniontech.com> - 115.8.0-1.0.1
+- rebrand to anolis
+
 * Mon Feb 19 2024 Eike Rathke <erack@redhat.com> - 115.8.0-1
 - Update to 115.8.0 build1
 
-- 
Gitee