From dff1ca8aa3632aa4e8fc239eaab4e8066d718b34 Mon Sep 17 00:00:00 2001 From: xzyang Date: Mon, 10 Jan 2022 14:33:49 +0800 Subject: [PATCH] rebrand: rebrand to anolis --- ....js.el7 => thunderbird-anolis-default-prefs.js.an7 | 2 +- thunderbird.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename thunderbird-centos-default-prefs.js.el7 => thunderbird-anolis-default-prefs.js.an7 (96%) diff --git a/thunderbird-centos-default-prefs.js.el7 b/thunderbird-anolis-default-prefs.js.an7 similarity index 96% rename from thunderbird-centos-default-prefs.js.el7 rename to thunderbird-anolis-default-prefs.js.an7 index c27d9d3..a3f8698 100644 --- a/thunderbird-centos-default-prefs.js.el7 +++ b/thunderbird-anolis-default-prefs.js.an7 @@ -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 OS"); 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 7831803..bbbe24a 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 @@ -129,7 +130,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 91.4.0 -Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -145,7 +146,7 @@ ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use -# licenses that are rejected by Red Hat Legal. +# licenses that are rejected by Anolis 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 @@ -163,7 +164,7 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-centos-default-prefs.js.el7 +Source701: thunderbird-anolis-default-prefs.js.an7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -1159,6 +1160,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jan 10 2022 yangxianzhao - 91.4.0-3.0.1 +- Rebrand for Anolis +- Cherry-pick [d27bd59] + * Tue Dec 07 2021 Eike Rathke - 91.4.0-3 - Bump NVR for ppc64 build -- Gitee