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 4d01b7833b018d0bf5fe31dab6d5e578aadc53ec..a87a4459cbce1a6d1c2e9e96ecbbc2aab9ed21e5 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 2e013993864c133396ceca58297d67e7931da4f2..cf3c7d92dfcbded0ae4c0f22fbb8be8e9188853a 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: 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-6.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 +* Mon Nov 29 2021 lihaipeng - 91.3.0-2.0.1 +- Cherry-pick [c04e687] +- Rename default js file and update vendor + * Tue Nov 02 2021 Eike Rathke - 91.3.0-2 - Update to 19.3.0 build2