[thunderbird-lightning/el6: 35/37] Merge in 1.2.1 from master

[Orion Poplawski]

commit 550d7ec373cef5e2ef21ee119d22ae696e2cd751
Merge: c4984ff 486b4ba
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 14 09:47:42 2012 -0600

    Merge in 1.2.1 from master

 .gitignore                         |   17 +++++++++
 mklangsource.sh                    |   31 ++++++++++++++++
 mozilla-build-s390.patch           |   11 ------
 mozilla-jemalloc.patch             |   47 ------------------------
 mozilla-libjpeg-turbo.patch        |   54 ----------------------------
 mozilla-missing-cflags.patch       |    9 -----
 sources                            |    4 +-
 thunderbird-lightning-gcc47.patch  |   46 ++++++++++++++++++++++++
 thunderbird-lightning.spec         |   69 +++++++++++++++++++++---------------
 thunderbird-mozconfig              |    4 +--
 xulrunner-1.9.2.1-build.patch      |   16 --------
 xulrunner-10.0-secondary-ipc.patch |   36 +++++++++++++++++++
 xulrunner-2.0-os2cc.patch          |   21 -----------
 13 files changed, 173 insertions(+), 192 deletions(-)
---
diff --cc .gitignore
index 85089d4,6c0a8b1..701f05a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,19 +1,21 @@@
  /thunderbird-3.1.9.source.tar.bz2
  /thunderbird-3.1.11.source.tar.bz2
 +/thunderbird-3.1.18.source.tar.bz2
 +/l10n-comm192-3.1.18.tar.xz
+ /thunderbird-5.0.source.tar.bz2
+ /lightning-1.0b5-source.tar.bz2
+ /l10n-miramar.tar.bz2
+ /thunderbird-6.0.source.tar.bz2
+ /lightning-1.0b7.source.tar.bz2
+ /l10n.tar.bz2
+ /lightning-1.0rc2.source.tar.bz2
+ /lightning-1.0.source.tar.bz2
+ /lightning-1.1.source.tar.bz2
+ /l10n.tar.xz
+ /l10n-1.1.tar.xz
+ /lightning-1.1.1.source.tar.bz2
+ /l10n-1.1.1.tar.xz
+ /l10n-1.2.tar.xz
+ /lightning-1.2.source.tar.bz2
+ /l10n-1.2.1.tar.xz
+ /lightning-1.2.1.source.tar.bz2
diff --cc thunderbird-lightning.spec
index c4ae3ed,85111ce..8e587fb
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@@ -192,12 -199,81 +199,15 @@@ find $RPM_BUILD_ROOT -name \*.so | xarg
  #===============================================================================
  
  %changelog
 -* Mon Feb 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.2.1-1
++* Wed Mar 14 2012 Orion Poplawski <orion at cora.nwra.com> - 1.2.1-1
+ - Update to 1.2.1
+ 
 -* Tue Jan 31 2012 Jan Horak <jhorak at redhat.com> - 1.2-1
 -- Update to 1.2
 +* Fri Feb 17 2012 Orion Poplawski <orion at cora.nwra.com> 1.0-0.44.b3pre
 +- Build l10n
  
 -* Fri Jan 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1.1-1
 -- Update to 1.1.1
 -- Re-enable eu locale
 -
 -* Thu Jan 5 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1-4
 -- Add patch to fixup gcc 4.7 build issues
 -
 -* Thu Jan 5 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1-3
 -- Update l10n source hopefully to 1.1 release (bug #771860)
 -
 -* Thu Jan 05 2012 Dan Horák <dan[at]danny.cz> - 1.1-2
 -- fix build on secondary arches (cherry-picked from 13afcd4c097c)
 -- disable jemalloc on s390(x) (taken from xulrunner)
 -
 -* Tue Dec 27 2011 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
 -- Update to lightning 1.1 final (same as rc1)
 -- Update l10n source
 -
 -* Tue Dec 20 2011 Orion Poplawski <orion at cora.nwra.com> - 1.1-0.1.rc1
 -- Update to lightning 1.1 rc1
 -- Update l10n source
 -- Skip eu locale for now
 -
 -* Tue Dec 20 2011 Jan Horak <jhorak at redhat.com> - 1.0-2
 -- Rebuild due to Thunderbird 9.0
 -
 -* Mon Nov 14 2011 Orion Poplawski <orion at cora.nwra.com> - 1.0-1
 -- Update to lightning 1.0
 -- Update l10n source
 -
 -* Wed Nov  9 2011 Jan Horak <jhorak at redhat.com> - 1.0-0.52.r2
 -- Use lightning 1.0rc2 source for TB 8
 -- Update l10n source
 -
 -* Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> - 1.0-0.51.b7
 -- sync secondary arches support with xulrunner/thunderbird
 -
 -* Wed Sep 28 2011 Orion Poplawski <orion at cora.nwra.com> - 1.0-0.50.b7
 -- Use lightning 1.0b7 source for TB 7
 -- Update l10n source
 -- Drop tbver patch
 -
 -* Wed Aug 31 2011 Dan Horák <dan[at]danny.cz> - 1.0-0.49.b5
 -- sync secondary arches support with xulrunner/thunderbird
 -
 -* Thu Aug 18 2011 Orion Poplawski <orion at cora.nwra.com> - 1.0-0.48.b5
 -- Use TB6 source
 -- Update l10n source, skipping si for now
 -- Drop patches fixed upstream
 -- Use Requires to match to thunderbird major version (bug #720709)
 -- Add patch to change tb version compatibility to 6.*
 -
 -* Fri Jul 29 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.47.b5rc3
 -- Package l10n langpacks (bug #504994)
 -
 -* Thu Jul 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.46.b5rc3
 -- Update to 1.0 b5 rc3
 -- Use lightning release sources
 -
 -* Tue Jul 19 2011 Dan Horák <dan[at]danny.cz> - 1.0-0.45.b3pre
 -- add xulrunner patches for secondary arches
 -
 -* Mon Jul 18 2011 Jan Horak <jhorak at redhat.com> - 1.0-0.44.b3pre
 -- Require nss-static only for Fedora 16+
 -
 -* Thu Jul 14 2011 Jan Horak <jhorak at redhat.com> - 1.0-0.43.b3pre
 -- Update to thunderbird 5 source
 -- Removed obsolete patches
 -- Adopted mozconfig from thunderbird package
 +* Fri Feb 17 2012 Orion Poplawski <orion at cora.nwra.com> 1.0-0.43.b3pre
 +- Update to thunderbird 3.1.18 source
 +- EL6 has nss-devel, no nss-static
  
  * Tue Jun 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.42.b3pre
  - Update to thunderbird 3.1.11 source