From 8381b5d42b8850cacd1a5afef6d2269da1dc2953 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 4 Feb 2021 11:09:58 +0800 Subject: [PATCH] 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 (cherry picked from commit 35aa6d781f19313e4a0f315cfb0b5387e6e57f9b) Signed-off-by: zhangbinchen --- thunderbird-redhat-default-prefs.js.rhel7 | 36 ----------------------- thunderbird.spec | 13 ++++++-- 2 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 thunderbird-redhat-default-prefs.js.rhel7 diff --git a/thunderbird-redhat-default-prefs.js.rhel7 b/thunderbird-redhat-default-prefs.js.rhel7 deleted file mode 100644 index 4d01b78..0000000 --- a/thunderbird-redhat-default-prefs.js.rhel7 +++ /dev/null @@ -1,36 +0,0 @@ -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.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -/* Disable global indexing by default*/ -pref("mailnews.database.global.indexer.enabled", false); - -/* Do not switch to Smart Folders after upgrade to 3.0b4 */ -pref("mail.folder.views.version", "1"); -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScopes", 0); - -/* For rhbz#1024232 */ -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1753011 */ -pref("spellchecker.dictionary_path", "/usr/share/myspell"); -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); -/* Disable telemetry */ -pref("datareporting.healthreport.uploadEnabled", false); -pref("datareporting.policy.dataSubmissionEnabled", false); -pref("toolkit.telemetry.archive.enabled", false); diff --git a/thunderbird.spec b/thunderbird.spec index f447f51..b20c94b 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: 2%{?dist} +Release: 2%{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 +* Wed Dec 15 2021 lihaipeng - 91.4.0-2.0.1 +- Cherry-pick [41046c9] +- Rename default js file and update vendor + * Mon Dec 06 2021 Eike Rathke - 91.4.0-2 - Update to 91.4.0 build2 -- Gitee