[thunderbird/f14/master] Enable mozilla crash reporter

[Jan Horak]

commit ebbb7a31454c7c04723d9d720f7b2a3c33f9abd7
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Jan 3 16:10:35 2011 +0100

    Enable mozilla crash reporter

 thunderbird.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/thunderbird.spec b/thunderbird.spec
index 2af3cfe..5a164cb 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -9,7 +9,7 @@
 %define moz_objdir objdir-tb
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 %define with_lightning_extension 1
-%define lightning_release 0.35.b3pre
+%define lightning_release 0.36.b3pre
 %define lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 %define gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 
@@ -22,7 +22,12 @@
 %define tarballdir comm-1.9.2
 
 %define official_branding 1
+# enable crash reporter only for iX86
+%ifarch %{ix86}
+%define enable_mozilla_crashreporter 1
+%else
 %define enable_mozilla_crashreporter 0
+%endif
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
@@ -30,7 +35,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        %{thunderbird_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -333,8 +338,10 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
-mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{thunderbird_version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
+# Debug symbols are stored in /usr/lib even in x86_64 arch
+DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
+mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
+cp objdir-tb/mozilla/dist/%{name}-%{thunderbird_version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
 %endif
 
 %if %{with_lightning_extension}
@@ -439,6 +446,9 @@ fi
 #===============================================================================
 
 %changelog
+* Mon Jan  3 2011 Jan Horak <jhorak at redhat.com> - 3.1.7-3
+- Mozilla crash reporter enabled
+
 * Thu Dec  9 2010 Jan Horak <jhorak at redhat.com> - 3.1.7-2
 - Fixed useragent