From ae10af2d3c912642a44dd85f02c2f018aceaa02a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 20 2015 15:54:56 +0000
Subject: import thunderbird-31.8.0-1.el7_1


---

diff --git a/.gitignore b/.gitignore
index 69051af..72c9dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/thunderbird-31.7.0.source.tar.bz2
-SOURCES/thunderbird-langpacks-31.7.0-20150510.tar.bz2
+SOURCES/thunderbird-31.8.0.source.tar.bz2
+SOURCES/thunderbird-langpacks-31.8.0-20150715.tar.bz2
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index f742dbc..6edf68a 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,2 +1,2 @@
-90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede SOURCES/thunderbird-31.7.0.source.tar.bz2
-d3bf9162ed79fd29ea60365d90ea799eed5cf381 SOURCES/thunderbird-langpacks-31.7.0-20150510.tar.bz2
+38492b0805a518bdc61e30aa541030195e425334 SOURCES/thunderbird-31.8.0.source.tar.bz2
+38336f5f3ab39cefb80b2fadf56c2294e674d767 SOURCES/thunderbird-langpacks-31.8.0-20150715.tar.bz2
diff --git a/SOURCES/build-nss-3.19.1.patch b/SOURCES/build-nss-3.19.1.patch
new file mode 100644
index 0000000..ae0cb00
--- /dev/null
+++ b/SOURCES/build-nss-3.19.1.patch
@@ -0,0 +1,12 @@
+diff -up comm-esr31/mozilla/configure.in.nss-3.18 comm-esr31/mozilla/configure.in
+--- comm-esr31/mozilla/configure.in.nss-3.18	2015-07-15 12:11:13.745268957 +0200
++++ comm-esr31/mozilla/configure.in	2015-07-15 12:11:32.630243688 +0200
+@@ -3655,7 +3655,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.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+ 
+ if test -n "$MOZ_NATIVE_NSS"; then
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/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 70c0f27..6d01dc0 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -66,7 +66,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        31.7.0
+Version:        31.8.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -75,11 +75,11 @@ 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}-20150510.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20150715.tar.bz2
 %endif
 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
@@ -93,6 +93,7 @@ Patch12:        mozilla-1129859-dictfix2.patch
 
 # Build patches
 Patch100:       thunderbird-objdir.patch
+Patch101:        build-nss-3.19.1.patch
 
 # Linux specific
 Patch200:       thunderbird-enable-addons.patch
@@ -189,7 +190,7 @@ cd %{tarballdir}
 
 %patch0   -p2 -b .dir
 %patch100 -p2 -b .objdir
-
+%patch101 -p1 -b .nss-3.19.1
 # Mozilla (XULRunner) patches
 cd mozilla
 %patch9   -p2 -b .arm
@@ -483,8 +484,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon May 11 2015 Johnny Hughes <johnny@centos.org> 31.7.0-1
-- Roll in CentOS Branding
+* Wed Jul 15 2015 Jan Horak <jhorak@redhat.com> - 31.8.0-1
+- Update to 31.8.0
 
 * Sun May 10 2015 Jan Horak <jhorak@redhat.com> - 31.7.0-1
 - Update to 31.7.0