From 7daaa7daa27c74665c79520bb35c11caa5391168 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 4 Feb 2021 11:09:58 +0800 Subject: [PATCH 1/2] rebrand: rename js file and update vendor Signed-off-by: Liwei Ge Change-Id: I957d526c6296e7556a07b2ad287125c78149dc74 (cherry picked from commit 9f864aa4358414ccd73f3e94c899196c33f38532) (cherry picked from commit c04e687d46b5dc2bae4eb1d25cfdacf0160e0587) Signed-off-by: zhangbinchen --- ...rhel7 => thunderbird-anolis-default-prefs.js.an7 | 6 +++--- thunderbird.spec | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) rename thunderbird-redhat-default-prefs.js.rhel7 => thunderbird-anolis-default-prefs.js.an7 (90%) diff --git a/thunderbird-redhat-default-prefs.js.rhel7 b/thunderbird-anolis-default-prefs.js.an7 similarity index 90% rename from thunderbird-redhat-default-prefs.js.rhel7 rename to thunderbird-anolis-default-prefs.js.an7 index 4d01b78..a87a445 100644 --- a/thunderbird-redhat-default-prefs.js.rhel7 +++ b/thunderbird-anolis-default-prefs.js.an7 @@ -1,8 +1,8 @@ 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"); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +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 4f88d34..4c9b21a 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.3.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 @@ -163,7 +164,9 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-redhat-default-prefs.js.rhel7 +#add by anolis +Source701: thunderbird-anolis-default-prefs.js.an7 +#end anolis Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -315,7 +318,7 @@ Requires: nss >= %{nss_build_version} BuildRequires: desktop-file-utils BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -1151,6 +1154,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu Dec 09 2021 lihaipeng - 91.3.0-3.0.1 +- Cherry-pick [35aa6d7] +- Rename default js file and update vendor + * Fri Dec 03 2021 Jan Horak - 91.3.0-3 - Updated nss library -- Gitee From ab4a432fe134b44c69f7fc9b3c1f3826610e61f0 Mon Sep 17 00:00:00 2001 From: zhangbinchen Date: Mon, 29 Nov 2021 20:31:15 +0800 Subject: [PATCH 2/2] spec : remove BR system-bookmarks Signed-off-by: zhangbinchen --- thunderbird.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/thunderbird.spec b/thunderbird.spec index 4c9b21a..e3cc631 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -317,7 +317,6 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks Requires: anolis-indexhtml %if %{?run_tests} -- Gitee