diff --git a/.gitignore b/.gitignore index 97be128..130c7ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/Python-2.7.13.tar.xz SOURCES/gtk3-private-3.22.26-1.el6.src.rpm SOURCES/libffi-3.0.13-18.el7_3.src.rpm -SOURCES/lightning-langpacks-60.5.0.tar.xz -SOURCES/thunderbird-60.5.0.source.tar.xz -SOURCES/thunderbird-langpacks-60.5.0-20190129.tar.xz +SOURCES/lightning-langpacks-60.6.1.tar.xz +SOURCES/thunderbird-60.6.1.source.tar.xz +SOURCES/thunderbird-langpacks-60.6.1-20190325.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index ed1e36b..4af163b 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,7 +1,7 @@ 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm -530d620727da8a87afd4881d798d107c86924096 SOURCES/lightning-langpacks-60.5.0.tar.xz -37d847e8f59a1fe84433b74fe9f41a2876eef2be SOURCES/thunderbird-60.5.0.source.tar.xz -79d23a45e8fb56467421e05255bade9708b0c3bf SOURCES/thunderbird-langpacks-60.5.0-20190129.tar.xz +3029283a9ec9e753db02d47593b78e12f425186d SOURCES/lightning-langpacks-60.6.1.tar.xz +2ad442fa775df6ee0c432fda2b69463257d476cf SOURCES/thunderbird-60.6.1.source.tar.xz +40288da7b00f33ae234960426ceb437d25385d67 SOURCES/thunderbird-langpacks-60.6.1-20190325.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch deleted file mode 100644 index b551e1b..0000000 --- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h ---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200 -+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200 -@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo - void* aContext) { - asm volatile("nop; nop; nop; nop" : : : "memory"); - -- asm volatile("b %0" : : "X"(H) : "memory"); -+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory"); - } - - #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el6 b/SOURCES/thunderbird-centos-default-prefs.js.el6 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el6 +++ /dev/null @@ -1,30 +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.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* 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", ""); diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el7 +++ /dev/null @@ -1,30 +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.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* 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", ""); diff --git a/SOURCES/thunderbird-mozconfig b/SOURCES/thunderbird-mozconfig index c304223..646e90e 100644 --- a/SOURCES/thunderbird-mozconfig +++ b/SOURCES/thunderbird-mozconfig @@ -8,7 +8,8 @@ ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-calendar ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key -ac_add_options --with-google-api-keyfile=../google-api-key +ac_add_options --with-google-location-service-api-keyfile=../google-api-key +ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key ac_add_options --enable-pie ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-release diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 @@ -0,0 +1,30 @@ +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.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* 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", ""); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 @@ -0,0 +1,30 @@ +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.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* 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", ""); diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index c7416f6..21e8fbe 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -56,7 +56,7 @@ # Avoid patch failures %define _default_patch_fuzz 2 -%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} +%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} %if %{?system_sqlite} # The actual sqlite version (see #480989): @@ -91,7 +91,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 60.5.0 +Version: 60.6.1 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -107,7 +107,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20190129.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20190325.tar.xz # Locales for lightning Source2: lightning-langpacks-%{version}.tar.xz %endif @@ -129,8 +129,8 @@ Source205: gtk3-private-%{gtk3_nvr}-setup-flags-env.inc Source206: gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc Source301: yasm-1.2.0-3.el5.src.rpm Source303: libffi-3.0.13-18.el7_3.src.rpm -Source601: thunderbird-centos-default-prefs.js.el6 -Source701: thunderbird-centos-default-prefs.js.el7 +Source601: thunderbird-redhat-default-prefs.js.rhel6 +Source701: thunderbird-redhat-default-prefs.js.rhel7 #Python 2.7 Source100: https://www.python.org/ftp/python/%{bundled_python_version}/Python-%{bundled_python_version}.tar.xz @@ -167,8 +167,6 @@ Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch Patch415: mozilla-1436242.patch Patch416: mozilla-1460871-ldap-query.patch - -Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch #Removing this patch would lead to losing user saved credentials in profile! ## Thunderbird patches @@ -236,11 +234,11 @@ BuildRequires: rust-toolset-%{rst_version}-cargo BuildRequires: rust-toolset-%{rst_version}-rust %endif %if 0%{?rhel} == 8 +BuildRequires: cargo +BuildRequires: rust >= 1.24 BuildRequires: llvm >= %{llvm_version} BuildRequires: llvm-devel >= %{llvm_version} BuildRequires: clang >= %{llvm_version} -BuildRequires: llvm-toolset-%{llvm_version} -BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_bundled_python} #%if 0%{?rhel} == 6 @@ -374,10 +372,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %patch26 -p1 -b .icu %endif -%ifarch %{arm} -%patch1000 -p1 -b .mozilla-1238661 -%endif - # Thunderbird patches %{__rm} -f .mozconfig @@ -993,8 +987,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Feb 05 2019 Johnny Hughes 60.5.0-1 -- Manual CentOS Debranding +* Mon Mar 25 2019 Martin Stransky - 60.6.1-1 +- Update to 60.6.1 + +* Tue Mar 19 2019 Martin Stransky - 60.6.0-1 +- Update to 60.6.0 * Tue Jan 29 2019 Martin Stransky - 60.5.0-1 - Update to 60.5.0 @@ -1182,7 +1179,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to 24.3.0 * Mon Dec 16 2013 Martin Stransky - 24.2.0-4 -- Fixed rhbz#1024232 - thunderbird: squiggly lines used +- Fixed rhbz#1024232 - thunderbird: squiggly lines used for spelling correction disappear randomly * Fri Dec 13 2013 Martin Stransky - 24.2.0-3 @@ -1518,7 +1515,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to 3.0.1 * Mon Jan 18 2010 Martin Stransky - 3.0-5 -- Added fix for #480603 - thunderbird takes +- Added fix for #480603 - thunderbird takes unacceptably long time to start * Wed Dec 9 2009 Jan Horak - 3.0-4 @@ -1567,7 +1564,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Mar 2 2009 Jan Horak - 3.0-1.beta2 - Update to 3.0 beta2 -- Added Patch2 to build correctly when building with --enable-shared option +- Added Patch2 to build correctly when building with --enable-shared option * Wed Feb 25 2009 Fedora Release Engineering - 2.0.0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -1621,7 +1618,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros * Tue Sep 11 2007 Christopher Aillon 2.0.0.6-4 -- Fix crashes when using GTK+ themes containing a gtkrc which specify +- Fix crashes when using GTK+ themes containing a gtkrc which specify GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing * Mon Sep 10 2007 Martin Stransky 2.0.0.6-3 @@ -1667,7 +1664,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Feb 12 2007 Martin Stransky 1.5.0.9-8 - added fix for #227406: garbage characters on some websites (when pango is disabled) - + * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-7 - Updated cursor position patch from tagoh to fix issue with "jumping" cursor when in a textfield with tabs. @@ -1936,7 +1933,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Wed Sep 01 2004 David Hill 0.7.3-4 - remove all Xvfb-related hacks -* Wed Sep 01 2004 Warren Togami +* Wed Sep 01 2004 Warren Togami - actually apply psfonts - add mozilla gnome-uriloader patch to prevent build failure @@ -1980,7 +1977,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - temporary workaround for enigmail skin "modern" bug * Mon May 10 2004 David Hill 0.6-0.fdr.4 -- update to Enigmail 0.84.0 +- update to Enigmail 0.84.0 - update launch script * Mon May 10 2004 David Hill 0.6-0.fdr.3