From 31d6cfa0f035bbea0428546c5c6670745f96ce21 Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Fri, 11 Jun 2010 09:58:41 +0000
Subject: [PATCH] Switch to mozilla crash reporter and fixed
 thunderbird.desktop

---
 thunderbird.desktop |  1 +
 thunderbird.spec    | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/thunderbird.desktop b/thunderbird.desktop
index 159c15f..81dda0f 100644
--- a/thunderbird.desktop
+++ b/thunderbird.desktop
@@ -4,6 +4,7 @@ Name=Thunderbird
 GenericName=Email
 Comment=Send and Receive Email
 Exec=thunderbird
+TryExec=thunderbird
 Icon=thunderbird
 Terminal=false
 Type=Application
diff --git a/thunderbird.spec b/thunderbird.spec
index 3c512a9..b4d790d 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -17,7 +17,7 @@
 %define tarballdir comm-1.9.2
 
 %define official_branding 1
-%define include_debuginfo 0
+%define include_debuginfo 1
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
@@ -25,7 +25,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.1
-Release:        0.2.rc2%{?dist}
+Release:        0.3.rc2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -298,9 +298,8 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
-cp mozilla/dist/thunderbird-%{version}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $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}
 %endif
 
 #===============================================================================
@@ -389,6 +388,10 @@ fi
 #===============================================================================
 
 %changelog
+* Fri Jun 11 2010 Jan Horak <jhorak@redhat.com> - 3.1-0.3.rc2
+- Switch to Mozilla crash reporting tool
+- TryExec added to desktop file
+
 * Wed Jun  9 2010 Christopher Aillon <caillon@redhat.com> 3.1-0.2.rc2
 - Thunderbird 3.1 RC2