[thunderbird] Update to 11.0

[Martin Stransky]

commit 26ed967f16065b5975189efc5de60bfac222ea23
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 13 13:52:00 2012 +0100

    Update to 11.0

 .gitignore                              |    2 +
 mozilla-682832-proxy.patch              |  358 -------------------------------
 mozilla-727401.patch                    |   38 ----
 sources                                 |    4 +-
 thunderbird-mozconfig                   |    2 -
 thunderbird.spec                        |   46 +++--
 xulrunner-9.0-secondary-build-fix.patch |   11 -
 7 files changed, 33 insertions(+), 428 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13c50d4..a38c809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-10.0-20120131.tar.xz
 /thunderbird-10.0.1.source.tar.bz2
 /thunderbird-langpacks-10.0.1-20120209.tar.xz
+/thunderbird-11.0.source.tar.bz2
+/thunderbird-langpacks-11.0-20120313.tar.xz
diff --git a/sources b/sources
index bb68027..d53aff0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-623c32d9deae370383e1422b1ea48061  thunderbird-10.0.1.source.tar.bz2
-0c7c311278404805d33d35b2231aa20b  thunderbird-langpacks-10.0.1-20120209.tar.xz
+1d7127a3282e62d95eb9b59d47291b70  thunderbird-11.0.source.tar.bz2
+1cb665160a0d667da977cd9a9972497a  thunderbird-langpacks-11.0-20120313.tar.xz
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 552f532..219f972 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -13,9 +13,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --enable-optimize
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-xprint
diff --git a/thunderbird.spec b/thunderbird.spec
index 9cd2ef5..bcaeaea 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,11 +1,5 @@
-%define nspr_version 4.8.9
-%define nss_version 3.13.1
-%define cairo_version 1.8.8
-%define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
-%define libnotify_version 0.4
-%define build_langpacks 1
-%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
+# Build as a debug package?
+%define debug_build       0
 
 %if 0%{?fedora} <= 15
 %define system_sqlite 0
@@ -13,6 +7,17 @@
 %define system_sqlite 1
 %endif
 
+%define build_langpacks 1
+
+%define nspr_version 4.9
+%define nss_version 3.13.3
+%define cairo_version 1.8.8
+%define freetype_version 2.1.9
+%define sqlite_version 3.7.7.1
+%define libnotify_version 0.4
+
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
+
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
 #
@@ -32,8 +37,8 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        10.0.1
-Release:        3%{?dist}
+Version:        11.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -58,10 +63,6 @@ Source100:      find-external-requires
 Patch0:         thunderbird-install-dir.patch
 Patch7:         crashreporter-remove-static.patch
 Patch8:         xulrunner-10.0-secondary-ipc.patch
-# # cherry-picked from 13afcd4c097c
-Patch13:        xulrunner-9.0-secondary-build-fix.patch
-Patch14:        mozilla-727401.patch
-Patch15:        mozilla-682832-proxy.patch
 
 # Build patches
 Patch100:       xulrunner-10.0-gcc47.patch
@@ -150,9 +151,6 @@ cd %{tarballdir}
 cd mozilla
 %patch7 -p2 -b .static
 %patch8 -p3 -b .secondary-ipc
-%patch13 -p2 -b .secondary-build
-%patch14 -p1 -b .727401
-%patch15 -p2 -b .682832
 %if 0%{?fedora} >= 17
 %patch100 -p1 -b .gcc47
 %endif
@@ -188,6 +186,14 @@ echo "ac_add_options --enable-system-sqlite"  >> .mozconfig
 echo "ac_add_options --disable-system-sqlite" >> .mozconfig
 %endif
 
+%if %{?debug_build}
+echo "ac_add_options --enable-debug" >> .mozconfig
+echo "ac_add_options --disable-optimize" >> .mozconfig
+%else
+echo "ac_add_options --disable-debug" >> .mozconfig
+echo "ac_add_options --enable-optimize" >> .mozconfig
+%endif
+
 #===============================================================================
 
 %build
@@ -202,6 +208,9 @@ cd %{tarballdir}
 # 
 MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                       %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
 
@@ -374,6 +383,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Mar 13 2012 Martin Stransky <stransky at redhat.com> - 11.0-1
+- Update to 11.0
+
 * Thu Feb 23 2012 Jan Horak <jhorak at redhat.com> - 10.0.1-3
 - Added fix for proxy settings mozbz#682832