diff --git a/download b/download index 97005a19ecb6a2f4131aaf33878df9a3041c51a0..941d8556bd8428bfbfb3531443fed9511a91b1ac 100644 --- a/download +++ b/download @@ -4,3 +4,4 @@ d9c9dd9619daeb43820de97b04bede45 nss-3.90.0-2.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm 16f8a8028a91c36f00a627fe6f6d9d71 thunderbird-115.4.1.processed-source.tar.xz ac368733170f92a751093993784077c5 thunderbird-langpacks-115.4.1-20231025.tar.xz +6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz 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 4d01b7833b018d0bf5fe31dab6d5e578aadc53ec..1d192b118c3400135cd8897caa6ecbc6cc25feba 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 1d51290257f3dfae91882499b300ee1efd0d9371..2573316c893361e32425321a26afe4cd3ce49804 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,4 +1,6 @@ # Set for local builds only +%define anolis_release .0.1 + %global disable_toolsets 0 # Produce debug (non-optimized) package build. Suitable for debugging only @@ -67,7 +69,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 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 115.4.1 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -150,7 +152,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -165,7 +167,7 @@ Source1: thunderbird-langpacks-%{version}-20231025.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 @@ -177,6 +179,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 -- @@ -310,7 +313,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 @@ -1137,8 +1140,23 @@ which python3 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 Nov 23 2023 yangxianzhao - 115.4.1-1.0.1 +- rebrand to anolis +- fix build error + * Wed Oct 25 2023 Eike Rathke - 115.4.1-1 - Update to 115.4.1 build1