[thunderbird] Update to 13.0

[Jan Horak]

commit 48cb964e6ec02bf63d37934115c07e0506ea8334
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Jun 5 13:22:22 2012 +0200

    Update to 13.0

 .gitignore             |    2 +
 mozilla-724615.patch   |   24 -----
 mozilla-733867-x.patch |  265 ------------------------------------------------
 mozilla-file.patch     |   26 -----
 sources                |    4 +-
 thunderbird-mozconfig  |    2 +-
 thunderbird.spec       |   27 +++---
 xulrunner-prtime.patch |   10 ++
 8 files changed, 29 insertions(+), 331 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ac097b..18e649e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-12.0-20120424.tar.xz
 /thunderbird-12.0.1.source.tar.bz2
 /thunderbird-langpacks-12.0.1-20120430.tar.xz
+/thunderbird-13.0.source.tar.bz2
+/thunderbird-langpacks-13.0-20120605.tar.xz
diff --git a/sources b/sources
index af4407b..81e8013 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-64cacde4cb2b1e8736f1c3a0ea6a02db  thunderbird-12.0.1.source.tar.bz2
-ba8beb1d1d2902a7d2fea6cc3f39ebfe  thunderbird-langpacks-12.0.1-20120430.tar.xz
+0134c67c30e8598f2a64ea004d5bc4bc  thunderbird-13.0.source.tar.bz2
+e1961f65a693da079387a385c869d144  thunderbird-langpacks-13.0-20120605.tar.xz
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 5dfc417..88c79fd 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -1,6 +1,6 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
diff --git a/thunderbird.spec b/thunderbird.spec
index 768f65b..3e98e91 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -38,14 +38,14 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        12.0.1
-Release:        2%{?dist}
+Version:        13.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20120430.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20120605.tar.xz
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -61,14 +61,12 @@ Patch7:         crashreporter-remove-static.patch
 Patch8:         xulrunner-10.0-secondary-ipc.patch
 
 # Build patches
-Patch102:       mozilla-733867-x.patch
-Patch103:       mozilla-file.patch
 Patch104:       xulrunner-10.0-gcc47.patch
+Patch105:       xulrunner-prtime.patch
+
 # Linux specific
 Patch200:       thunderbird-8.0-enable-addons.patch
 
-# ARM Specific 
-Patch210: 	mozilla-724615.patch
 %if %{official_branding}
 # Required by Mozilla Corporation
 
@@ -152,13 +150,11 @@ cd %{tarballdir}
 cd mozilla
 %patch7 -p2 -b .static
 %patch8 -p3 -b .secondary-ipc
-%patch103 -p1 -b .mozilla-file
 %patch104 -p1 -b .gcc47
+%patch105 -p1 -b .prtime
 cd ..
-%patch102 -p1 -b .733867
 
 %patch200 -p1 -b .addons
-%patch210 -p1 -b .724615
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -238,16 +234,18 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
 # create debuginfo for crash-stats.mozilla.com
 %if %{enable_mozilla_crashreporter}
-make buildsymbols
+make -C objdir buildsymbols
 %endif
 
 #===============================================================================
 
 %install
-cd %{tarballdir}
+cd %{tarballdir}/objdir
 
 DESTDIR=$RPM_BUILD_ROOT make install
 
+cd ..
+
 # install icons
 for s in 16 22 24 32 48 256; do
     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
@@ -316,7 +314,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir}
-%{__cp} mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
+%{__cp} objdir/mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
 %endif
 
 #===============================================================================
@@ -391,6 +389,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Jun  5 2012 Jan Horak <jhorak at redhat.com> - 13.0-1
+- Update to 13.0
+
 * Mon May 7 2012 Martin Stransky <stransky at redhat.com> - 12.0.1-2
 - Fixed #717245 - adhere Static Library Packaging Guidelines
 
diff --git a/xulrunner-prtime.patch b/xulrunner-prtime.patch
new file mode 100644
index 0000000..c1efe33
--- /dev/null
+++ b/xulrunner-prtime.patch
@@ -0,0 +1,10 @@
+diff -up mozilla-release/hal/sandbox/PHal.ipdl.old mozilla-release/hal/sandbox/PHal.ipdl
+--- mozilla-release/hal/sandbox/PHal.ipdl.old   2012-06-01 14:04:00.000000000 +0200
++++ mozilla-release/hal/sandbox/PHal.ipdl       2012-06-05 09:15:02.524408100 +0200
+@@ -39,7 +39,7 @@
+ include protocol PContent;
+ include protocol PBrowser;
+-include "nspr/prtime.h";
++include "prtime.h";
+ include "mozilla/HalSensor.h";
+ include "mozilla/HalTypes.h";