rpms/thunderbird/F-13 .cvsignore, 1.38, 1.39 sources, 1.45, 1.46 thunderbird-mozconfig-debuginfo, 1.1, 1.2 thunderbird.spec, 1.171, 1.172

Jan Horak xhorak at fedoraproject.org
Tue Jul 20 16:01:00 UTC 2010


Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16499

Modified Files:
	.cvsignore sources thunderbird-mozconfig-debuginfo 
	thunderbird.spec 
Log Message:
Update to 3.1.1, preparing sources for Mozilla crash reporter tool


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-13/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	24 Jun 2010 14:15:30 -0000	1.38
+++ .cvsignore	20 Jul 2010 16:01:00 -0000	1.39
@@ -1,2 +1,2 @@
-thunderbird-langpacks-3.1-20100624.tar.bz2
-thunderbird-3.1.source.tar.bz2
+thunderbird-3.1.1.source.tar.bz2
+thunderbird-langpacks-3.1.1-20100720.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-13/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	24 Jun 2010 14:15:30 -0000	1.45
+++ sources	20 Jul 2010 16:01:00 -0000	1.46
@@ -1,2 +1,2 @@
-e4c013f198fc054a87a31ecf85eb17e4  thunderbird-langpacks-3.1-20100624.tar.bz2
-feb4d737d568066076879a09bd0d506e  thunderbird-3.1.source.tar.bz2
+3a8479252bb9a0c534870896fc10e2ff  thunderbird-3.1.1.source.tar.bz2
+57024bdeb2267b787ba72741ceac9591  thunderbird-langpacks-3.1.1-20100720.tar.bz2


Index: thunderbird-mozconfig-debuginfo
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-13/thunderbird-mozconfig-debuginfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunderbird-mozconfig-debuginfo	25 Nov 2009 10:56:33 -0000	1.1
+++ thunderbird-mozconfig-debuginfo	20 Jul 2010 16:01:00 -0000	1.2
@@ -1,5 +1,6 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
 ac_add_options --enable-crashreporter


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-13/thunderbird.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- thunderbird.spec	24 Jun 2010 14:15:30 -0000	1.171
+++ thunderbird.spec	20 Jul 2010 16:01:00 -0000	1.172
@@ -17,14 +17,14 @@
 %define tarballdir comm-1.9.2
 
 %define official_branding 1
-%define include_debuginfo 0
+%define enable_mozilla_crashreporter 0
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        3.1
+Version:        3.1.1
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -37,7 +37,7 @@ Group:          Applications/Internet
 Source0:        %{tarball}
 %if %{build_langpacks}
 # Language package archive is build by RH
-Source1:        thunderbird-langpacks-%{version}-20100624.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20100720.tar.bz2
 %endif
 # Config file for compilation
 Source10:       thunderbird-mozconfig
@@ -64,6 +64,9 @@ Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
 # Fixes gcc complain that nsFrame::delete is protected
 Patch4:         xulrunner-1.9.2.1-build.patch
+# Fix missing includes for crash reporter, remove in 3.1 final
+Patch5:         xulrunner-missing-headers.patch
+Patch6:         remove-static.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -156,6 +159,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
 %patch4 -p1 -b .protected
+%patch5 -p0 -b .stat
+%patch6 -p1 -b .static
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -170,7 +175,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %if %{official_branding}
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 %{__cat} %{SOURCE13} >> .mozconfig
 %endif
 
@@ -202,7 +207,7 @@ export MAKE="gmake %{moz_make_flags}"
 make -f client.mk build
 
 # create debuginfo for crash-stats.mozilla.com
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 cd %{moz_objdir}
 make buildsymbols
 %endif
@@ -337,9 +342,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/compon
 
 
 # Add debuginfo for crash-stats.mozilla.com 
-%if %{include_debuginfo}
-mkdir -p $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}
+%if %{enable_mozilla_crashreporter}
+mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
 %endif
 
 #===============================================================================
@@ -418,7 +423,7 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
 %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
 %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
-%if %{include_debuginfo}
+%if %{enable_mozilla_crashreporter}
 %{mozappdir}/crashreporter
 %{mozappdir}/crashreporter.ini
 %{mozappdir}/Throbber-small.gif
@@ -436,6 +441,9 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 3.1.1-1
+- Update to 3.1.1
+
 * Thu Jun 24 2010 Jan Horak <jhorak at redhat.com> - 3.1-1
 - Thunderbird 3.1
 



More information about the scm-commits mailing list