[thunderbird: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/thunderbird

[Jan Horak]

commit fbdb99341260a8eaee8a0394209b77a7c14a9112
Merge: b1a3545 363264a
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Apr 24 10:01:38 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/thunderbird
    
    Conflicts:
    	thunderbird.spec

 mozilla-724615.patch |   24 ++++++++++++++++++++++++
 thunderbird.spec     |    6 ++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --cc thunderbird.spec
index 8e7f730,644faa5..1be198d
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@@ -148,10 -152,15 +150,11 @@@ cd %{tarballdir
  cd mozilla
  %patch7 -p2 -b .static
  %patch8 -p3 -b .secondary-ipc
 -%if 0%{?fedora} >= 17
 -%patch100 -p1 -b .gcc47
 -%endif
 -%patch101 -p2 -b .722127
  cd ..
 -%patch102 -p2 -b .733867
 +%patch102 -p1 -b .733867
  
  %patch200 -p1 -b .addons
+ %patch210 -p1 -b .724615
  
  %if %{official_branding}
  # Required by Mozilla Corporation
@@@ -384,9 -392,9 +387,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  #===============================================================================
  
  %changelog
 +* Tue Apr 24 2012 Jan Horak <jhorak at redhat.com> - 12.0-1
 +- Update to 12.0
 +
+ * Mon Apr 16 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 11.0.1-2
+ - Add upstream patch to fix FTBFS on ARM
+ 
  * Thu Mar 29 2012 Jan Horak <jhorak at redhat.com> - 11.0.1-1
  - Update to 11.0.1