From 74d98421a19270ba27b832108cb3335266714273 Mon Sep 17 00:00:00 2001 From: Lvcongqing Date: Wed, 13 Apr 2022 09:31:57 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!26=20:?= =?UTF-8?q?=20rebrand=20to=20anolis'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....el7 => thunderbird-redhat-default-prefs.js.rhel7 | 2 +- thunderbird.spec | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) rename thunderbird-anolis-default-prefs.js.el7 => thunderbird-redhat-default-prefs.js.rhel7 (96%) diff --git a/thunderbird-anolis-default-prefs.js.el7 b/thunderbird-redhat-default-prefs.js.rhel7 similarity index 96% rename from thunderbird-anolis-default-prefs.js.el7 rename to thunderbird-redhat-default-prefs.js.rhel7 index 1d192b1..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js.el7 +++ b/thunderbird-redhat-default-prefs.js.rhel7 @@ -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", "Red Hat"); 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 afa97d7..c318f09 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,6 +1,5 @@ # Set for local builds only %global disable_toolsets 0 -%define anolis_release .0.1 %ifarch %{ix86} # no debug package for the i686 because oom on i686 with debuginfos @@ -130,7 +129,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 91.8.0 -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -146,11 +145,11 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use -# licenses that are rejected by Anolis Legal. +# licenses that are rejected by Red Hat Legal. # The official tarball has to be always processed by the process-official-tarball # script. # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz @@ -168,7 +167,7 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-anolis-default-prefs.js.el7 +Source701: thunderbird-redhat-default-prefs.js.rhel7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -1125,9 +1124,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Apr 13 2022 zhang xianting - 91.8.0-1.0.1 -- Rebrand to anolis - * Tue Apr 05 2022 Eike Rathke - 91.8.0-1 - Update to 91.8.0 -- Gitee