From c22ee6a08a00e3b0d54f808e9105fdd3bb64c669 Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Tue, 20 Jul 2010 16:05:20 +0000
Subject: [PATCH] Update to 3.1.1

---
 .cvsignore       |  4 ++--
 sources          |  4 ++--
 thunderbird.spec | 21 ++++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7f2cb63..757f130 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-thunderbird-langpacks-3.1-20100624.tar.bz2
-thunderbird-3.1.source.tar.bz2
+thunderbird-3.1.1.source.tar.bz2
+thunderbird-langpacks-3.1.1-20100720.tar.bz2
diff --git a/sources b/sources
index a022abf..5feae38 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e4c013f198fc054a87a31ecf85eb17e4  thunderbird-langpacks-3.1-20100624.tar.bz2
-feb4d737d568066076879a09bd0d506e  thunderbird-3.1.source.tar.bz2
+3a8479252bb9a0c534870896fc10e2ff  thunderbird-3.1.1.source.tar.bz2
+57024bdeb2267b787ba72741ceac9591  thunderbird-langpacks-3.1.1-20100720.tar.bz2
diff --git a/thunderbird.spec b/thunderbird.spec
index f0aeef4..6a6df74 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -17,14 +17,14 @@
 %define tarballdir comm-1.9.2
 
 %define official_branding 1
-%define include_debuginfo 0
+%define enable_mozilla_crashreporter 0
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        3.1
+Version:        3.1.1
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -37,7 +37,7 @@ Group:          Applications/Internet
 Source0:        %{tarball}
 %if %{build_langpacks}
 # Language package archive is build by RH
-Source1:        thunderbird-langpacks-%{version}-20100624.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20100720.tar.bz2
 %endif
 # Config file for compilation
 Source10:       thunderbird-mozconfig
@@ -144,7 +144,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %if %{official_branding}
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 %{__cat} %{SOURCE13} >> .mozconfig
 %endif
 
@@ -176,7 +176,7 @@ export MAKE="gmake %{moz_make_flags}"
 make -f client.mk build
 
 # create debuginfo for crash-stats.mozilla.com
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 cd %{moz_objdir}
 make buildsymbols
 %endif
@@ -302,9 +302,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 
 # Add debuginfo for crash-stats.mozilla.com 
-%if %{include_debuginfo}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+%if %{enable_mozilla_crashreporter}
+mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
 %endif
 
 #===============================================================================
@@ -383,7 +383,7 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
 %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
 %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 %{mozappdir}/crashreporter
 %{mozappdir}/crashreporter.ini
 %{mozappdir}/Throbber-small.gif
@@ -393,6 +393,9 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Jul 20 2010 Jan Horak <jhorak@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+
 * Thu Jun 24 2010 Jan Horak <jhorak@redhat.com> - 3.1-1
 - Thunderbird 3.1