packages: icedove/icedove.spec - crashreporter support

Tue Aug 17 20:50:03 CEST 2010

Author: glen                         Date: Tue Aug 17 18:50:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- crashreporter support

---- Files affected:
packages/icedove:
   icedove.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.93 packages/icedove/icedove.spec:1.94

--- packages/icedove/icedove.spec:1.93	Tue Aug 17 17:00:49 2010
+++ packages/icedove/icedove.spec	Tue Aug 17 20:49:58 2010
@@ -16,13 +16,18 @@
 %bcond_without	gnome		# disable all GNOME components (gnome+gnomeui+gnomevfs)
 %bcond_without	ldap		# disable e-mail address lookups in LDAP directories
 %bcond_without  lightning	# disable sunbird calendar
-%bcond_with		xulrunner	# build with system xulrunner
+%bcond_with		xulrunner	# build with xulrunner
+%bcond_with	crashreporter	# report crashes to crash-stats.mozilla.com
 
 %if %{without gnome}
 %undefine	with_gnomeui
 %undefine	with_gnomevfs
 %endif
 
+%if %{?_enable_debug_packages} != 1
+%undefine	crashreporter
+%endif
+
 %define		enigmail_ver		1.1.2
 
 %if %{without xulrunner}
@@ -34,7 +39,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.1.2
-Release:	0.8
+Release:	0.10
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
@@ -57,6 +62,7 @@
 Patch8:		%{name}-makefile.patch
 Patch9:		%{name}-libpng.patch
 Patch10:	%{name}-extensiondir.patch
+Patch11:	crashreporter.patch
 URL:		http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -177,12 +183,10 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p2
+%patch11 -p2
 
 %build
 cd mozilla
-export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
-export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
-
 cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
 cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
@@ -193,6 +197,13 @@
 cat << EOF > .mozconfig
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
+export CFLAGS="%{rpmcflags} %{?with_crashreporter:-gstabs+}"
+export CXXFLAGS="%{rpmcflags} %{?with_crashreporter:-gstabs+}"
+
+%if %{with crashreporter}
+export MOZ_DEBUG_SYMBOLS=1
+%endif
+
 # Options for 'configure' (same as command-line options).
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
@@ -242,7 +253,11 @@
 %else
 ac_add_options --disable-ldap
 %endif
+%if %{with crashreporter}
+ac_add_options --enable-crashreporter
+%else
 ac_add_options --disable-crashreporter
+%endif
 ac_add_options --disable-xterm-updates
 ac_add_options --enable-postscript
 %if %{with lightning}
@@ -292,9 +307,15 @@
 
 %{__make} -j1 -f client.mk build \
 	STRIP="/bin/true" \
+	MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
+%if %{with crashreporter}
+# create debuginfo for crash-stats.mozilla.com
+%{__make} -j1 -C obj-%{_target_cpu} buildsymbols
+%endif
+
 %if %{with enigmail}
 top=$(pwd)
 cd mailnews/extensions/enigmail
@@ -307,9 +328,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \
-	       $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}}
 
 cd mozilla/obj-%{_target_cpu}
 %{__make} -C mail/installer stage-package \
@@ -317,6 +336,15 @@
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
 
+# Enable crash reporter for Firefox application
+%if %{with crashreporter}
+%{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/' $RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini
+
+# Add debuginfo for crash-stats.mozilla.com
+mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name}
+cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name}
+%endif
+
 # copy manually lightning files, somewhy they are not installed by make
 cp -a mozilla/dist/bin/extensions/calendar-timezones at mozilla.org \
 	mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
@@ -344,7 +372,7 @@
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 
 cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-cp -a ../icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png
+cp -a ../icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 # files created by regxpcom -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -400,7 +428,8 @@
 %attr(755,root,root) %{_bindir}/mozilla-thunderbird
 %attr(755,root,root) %{_bindir}/thunderbird
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.ini
+%{_libdir}/%{name}/application.ini
+%{_libdir}/%{name}/platform.ini
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %{_libdir}/%{name}/components/*.js
@@ -433,6 +462,12 @@
 %{_datadir}/%{name}/modules
 %{_datadir}/%{name}/res
 
+%if %{with crashreporter}
+%attr(755,root,root) %{_libdir}/%{name}/crashreporter
+%{_libdir}/%{name}/crashreporter.ini
+%{_libdir}/%{name}/Throbber-small.gif
+%endif
+
 %dir %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 
@@ -479,6 +514,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/08/17 18:49:58  glen
+- crashreporter support
+
 Revision 1.93  2010/08/17 15:00:49  glen
 - shared lib perms for lightning ext
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.93&r2=1.94&f=u

