[thunderbird/f13/master] - added --enable-static - switch to gdwarf-2 - thunderbird-shared-error.patch removed

[Jan Horak]

commit a88e22a270183f3fc104453b45a585e87ce32e2c
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Mar 2 14:29:29 2011 +0100

    - added --enable-static
    - switch to gdwarf-2
    - thunderbird-shared-error.patch removed

 thunderbird-mozconfig           |    1 +
 thunderbird-mozconfig-debuginfo |    5 ++---
 thunderbird-shared-error.patch  |   16 ----------------
 thunderbird.spec                |   11 +++++++++--
 4 files changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index e338eda..3bbd52c 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -29,6 +29,7 @@ ac_add_options --enable-system-hunspell
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
+ac_add_options --enable-static
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo
index 65ec915..4dd2427 100644
--- a/thunderbird-mozconfig-debuginfo
+++ b/thunderbird-mozconfig-debuginfo
@@ -1,6 +1,5 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
+export CFLAGS="$CFLAGS -gdwarf-2"
+export CXXFLAGS="$CXXFLAGS -gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 ac_add_options --enable-crashreporter
diff --git a/thunderbird.spec b/thunderbird.spec
index db1b57c..c068bc8 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -22,7 +22,12 @@
 %define tarballdir comm-1.9.2
 
 %define official_branding 1
+# enable crash reporter only for iX86
+%ifarch %{ix86} x86_64
+%define enable_mozilla_crashreporter 1
+%else
 %define enable_mozilla_crashreporter 0
+%endif
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
@@ -365,8 +370,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}