[xulrunner/f14/master] Enabled mozilla crash reporter

[Jan Horak]

commit a6fa45542bd098e45ef5256dcef3069003983874
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Jan 3 13:18:41 2011 +0100

    Enabled mozilla crash reporter

 xulrunner.spec |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 80a9b82..96529f1 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -12,7 +12,12 @@
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.2
-%define enable_mozilla_crashreporter       0
+# enable crash reporter only for iX86
+%ifarch %{ix86}
+%define enable_mozilla_crashreporter 1
+%else
+%define enable_mozilla_crashreporter 0
+%endif
 
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
@@ -23,7 +28,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.13
-Release:        3%{?pretag}%{?dist}
+Release:        4%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -363,9 +368,10 @@ touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
-#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/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 dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
 %endif
 
 #---------------------------------------------------------------------
@@ -453,6 +459,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jan  3 2011 Jan Horak <jhorak at redhat.com> - 1.9.2.13-4
+- Enabled mozilla crash reporter
+
 * Mon Jan 3 2011 Martin Stransky <stransky at redhat.com> 1.9.2.13-3
 - reverted fix for rhbz#658471, breaks gnome shell
 - disabled system cairo, breaks animated gifs (rhbz#628331)