From 21430f6e1d4ea3064f9028cc091808edbdbced3d Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Mon, 27 Aug 2012 15:20:29 +0200
Subject: [PATCH] Update to 15.0

---
 .gitignore                        |  2 ++
 crashreporter-remove-static.patch | 13 -------------
 sources                           |  4 ++--
 thunderbird.spec                  | 11 ++++++-----
 4 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 crashreporter-remove-static.patch

diff --git a/.gitignore b/.gitignore
index ed26a01..b19e83b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-13.0.1-20120615.tar.xz
 /thunderbird-14.0.source.tar.bz2
 /thunderbird-langpacks-14.0-20120717.tar.xz
+/thunderbird-15.0.source.tar.bz2
+/thunderbird-langpacks-15.0-20120827.tar.xz
diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch
deleted file mode 100644
index 330ab1a..0000000
--- a/crashreporter-remove-static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Remove static build option from crashreporter to remove dependency on static libraries
-
-diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
---- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static	2010-06-23 19:47:11.000000000 +0200
-+++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in	2010-07-12 15:51:41.000000000 +0200
-@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
- 
- #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
- # due to them having an older libstdc++
--HOST_LDFLAGS += -static
-+#HOST_LDFLAGS += -static
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/sources b/sources
index 0cf9dc4..fa058ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-64dcfaa0aa47aa5fd8588090503fac9d  thunderbird-14.0.source.tar.bz2
-10a06f10119440d9d507756bf001b6a0  thunderbird-langpacks-14.0-20120717.tar.xz
+e41f88ca2fd0c9bc608aa2c145b3bc2c  thunderbird-15.0.source.tar.bz2
+6d525b55088923e15dce58cfe1215d35  thunderbird-langpacks-15.0-20120827.tar.xz
diff --git a/thunderbird.spec b/thunderbird.spec
index d03ee61..e357aa2 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -39,14 +39,14 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        14.0
-Release:        4%{?dist}
+Version:        15.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}-20120717.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20120827.tar.xz
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -58,7 +58,6 @@ Source100:      find-external-requires
 
 # Mozilla (XULRunner) patches
 Patch0:         thunderbird-install-dir.patch
-Patch7:         crashreporter-remove-static.patch
 Patch8:         xulrunner-10.0-secondary-ipc.patch
 
 # Build patches
@@ -148,7 +147,6 @@ cd %{tarballdir}
 %patch0  -p2 -b .dir
 # Mozilla (XULRunner) patches
 cd mozilla
-%patch7 -p2 -b .static
 %patch8 -p3 -b .secondary-ipc
 %patch104 -p1 -b .gcc47
 cd ..
@@ -391,6 +389,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Aug 27 2012 Jan Horak <jhorak@redhat.com> - 15.0-1
+- Update to 15.0
+
 * Wed Aug 1 2012 Martin Stransky <stransky@redhat.com> - 14.0-4
 - Removed StartupWMClass (rhbz#844863)
 - Fixed -g parameter