diff --git a/.gitignore b/.gitignore index e35827a..3a65830 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm -SOURCES/thunderbird-91.5.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz +SOURCES/thunderbird-91.6.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index df739f9..6f336fa 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm -96483930beccc90117f19d77eb57f982aad086ea SOURCES/thunderbird-91.5.0.processed-source.tar.xz -db0eadc8a9ece29e56420ad74faf0df3545acbe8 SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz +5f4f619a433c7abc51733215a128dbc7ddb5be0c SOURCES/thunderbird-91.6.0.processed-source.tar.xz +fe71530869aeb1b6039e0ae4dfc13498c2035560 SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7 deleted file mode 100644 index c27d9d3..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el7 +++ /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", "CentOS"); -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/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 23f38b6..f6f5ca2 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -128,7 +128,7 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.5.0 +Version: 91.6.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -155,7 +155,7 @@ ExcludeArch: aarch64 s390 ppc # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220107.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220207.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -167,7 +167,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-redhat-default-prefs.js.rhel7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -1023,47 +1023,10 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -%{__mkdir_p} %{buildroot}%{_datadir}/appdata -cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml < - - - - mozilla-thunderbird.desktop - CC0-1.0 - MPLv1.1 or GPLv2+ or LGPLv2+ - -

- Thunderbird is an email client that allows you to read, write and organise all - of your email messages. It is compatible with most email accounts, including the - most popular webmail services. -

-

- Thunderbird is designed by Mozilla, a global community working together to make - the Internet better. Mozilla believe that the Internet should be open, public, - and accessible to everyone without any restrictions. -

-
    -
  • Easier than ever to set up a new e-mail account
  • -
  • Awesome search allows you to find your messages fast
  • -
  • Thousands of add-ons give you the freedom to make Thunderbird your own
  • -
-
- http://www.mozilla.org/thunderbird/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png - - - - - -
-EOF + +# Register as an application to be visible in the software center +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml #--------------------------------------------------------------------- @@ -1155,8 +1118,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Jan 12 2022 CentOS Sources - 91.5.0-1.el8.centos -- Apply debranding changes +* Mon Feb 07 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 * Fri Jan 07 2022 Eike Rathke - 91.5.0-1 - Update to 91.5.0 build1