diff --git a/.gitignore b/.gitignore index 4b673a1..6b2234e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/l10n-lightning-38.3.0.tar.bz2 -SOURCES/thunderbird-38.3.0.source.tar.bz2 -SOURCES/thunderbird-langpacks-38.3.0-20150929.tar.bz2 +SOURCES/l10n-lightning-38.4.0.tar.bz2 +SOURCES/thunderbird-38.4.0.source.tar.bz2 +SOURCES/thunderbird-langpacks-38.4.0-20151122.tar.bz2 diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 9a90ff6..574edc1 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,3 +1,3 @@ -b944cb59b3fcc16198a0647bc5c289d9a77c0411 SOURCES/l10n-lightning-38.3.0.tar.bz2 -7c8ef066d6b6516fddbb654b38353f894f85d469 SOURCES/thunderbird-38.3.0.source.tar.bz2 -8b452489a8cb44b72c37321ef3921f63c900c178 SOURCES/thunderbird-langpacks-38.3.0-20150929.tar.bz2 +b944cb59b3fcc16198a0647bc5c289d9a77c0411 SOURCES/l10n-lightning-38.4.0.tar.bz2 +e180f19b920ff2d9c1d4c90df6b5c8b99b103116 SOURCES/thunderbird-38.4.0.source.tar.bz2 +85e7efbe21c0ce4f65228b29096cc3d2cb09cbee SOURCES/thunderbird-langpacks-38.4.0-20151122.tar.bz2 diff --git a/SOURCES/firefox-nss-3.19.1.patch b/SOURCES/firefox-nss-3.19.1.patch index 53c8426..44f6519 100644 --- a/SOURCES/firefox-nss-3.19.1.patch +++ b/SOURCES/firefox-nss-3.19.1.patch @@ -1,11 +1,20 @@ -diff -up mozilla-esr38/configure.in.nss-3.19.0 mozilla-esr38/configure.in ---- mozilla-esr38/configure.in.nss-3.19.0 2015-06-25 10:36:40.205019840 +0200 -+++ mozilla-esr38/configure.in 2015-06-25 11:58:46.859155245 +0200 +diff -up mozilla-esr38/configure.in.nss-3.19.1 mozilla-esr38/configure.in +--- mozilla-esr38/configure.in.nss-3.19.1 2015-10-29 11:17:50.666423563 +0100 ++++ mozilla-esr38/configure.in 2015-10-29 11:28:06.142004473 +0100 +@@ -52,7 +52,7 @@ dnl ==================================== + MOZJPEG=62 + MOZPNG=10616 + NSPR_VERSION=4 +-NSPR_MINVER=4.10.10 ++NSPR_MINVER=4.10.8 + NSS_VERSION=3 + + dnl Set the minimum version of toolkit libs used by mozilla @@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.19.2.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi diff --git a/SOURCES/thunderbird-centos-default-prefs.js b/SOURCES/thunderbird-centos-default-prefs.js deleted file mode 100644 index 013aa21..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js +++ /dev/null @@ -1,28 +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); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js b/SOURCES/thunderbird-redhat-default-prefs.js new file mode 100644 index 0000000..af23193 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js @@ -0,0 +1,28 @@ +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); diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 1b53374..d3bd461 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -19,10 +19,8 @@ %define build_langpacks 1 %if %{?system_nss} -%global nspr_version 4.10.6 -%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.16.2.3 -%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) +%global nspr_version 4.10.8-2 +%global nss_version 3.19.1-7 %endif %define cairo_version 1.8.8 @@ -64,14 +62,14 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 38.3.0 +Version: 38.4.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20150929.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20151122.tar.bz2 %endif # Locales for lightning Source2: l10n-lightning-%{version}.tar.bz2 @@ -79,7 +77,7 @@ Source3: mklangsource.sh Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded -Source12: thunderbird-centos-default-prefs.js +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source100: find-external-requires @@ -121,8 +119,8 @@ Patch600: firefox-ppc64le.patch BuildRequires: nss-static >= %{nss_version} BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} -Requires: nspr >= %{nspr_build_version} -Requires: nss >= %{nss_build_version} +Requires: nspr >= %{nspr_version} +Requires: nss >= %{nss_version} %endif BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libnotify-devel >= %{libnotify_version} @@ -587,8 +585,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Thu Oct 01 2015 CentOS Sources - 38.3.0-1.el7.centos -- rebrand default prefs +* Sun Nov 22 2015 Jan Horak - 38.4.0-1 +- Update to 38.4.0 * Tue Sep 29 2015 Jan Horak - 38.3.0-1 - Update to 38.3.0