[thunderbird-lightning] Update to Thunderbird 5, removed obsolete patches, mozconfig adopted from thunderbird package

[Jan Horak]

commit aaa692f6cae5b5a03fde2d01d0c21236b9784d2d
Author: Jan Horak <jhorak at redhat.com>
Date:   Thu Jul 14 16:52:08 2011 +0200

    Update to Thunderbird 5, removed obsolete patches, mozconfig adopted from thunderbird package

 thunderbird-lightning.spec |   31 +++++++++++--------------------
 thunderbird-mozconfig      |    2 --
 2 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 9bf9021..f95dd3c 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -4,7 +4,7 @@
 %global freetype_version 2.1.9
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
-%global thunderbird_version 3.1.11
+%global thunderbird_version 5.0
 %global moz_objdir objdir-tb
 %global thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
 %global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
@@ -16,15 +16,15 @@
 # IMPORTANT: If there is no top level directory, this should be
 # set to the cwd, ie: '.'
 #define tarballdir .
-%global tarballdir comm-1.9.2
+%global tarballdir comm-miramar
 
-%global version_internal  3.1
+%global version_internal  5
 %global mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        1.0
-Release:        0.42.b3pre%{?dist}
+Release:        0.43.b3pre%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -38,12 +38,6 @@ Source100:      find-external-requires
 
 # Mozilla (XULRunner) patches
 Patch0:         thunderbird-version.patch
-Patch2:         mozilla-jemalloc.patch
-Patch3:         xulrunner-1.9.2.1-build.patch
-Patch4:         mozilla-libjpeg-turbo.patch
-Patch5:         mozilla-missing-cflags.patch
-Patch6:         mozilla-build-s390.patch
-Patch9:         xulrunner-2.0-os2cc.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
@@ -74,6 +68,8 @@ BuildRequires:  autoconf213
 BuildRequires:  desktop-file-utils
 BuildRequires:  libcurl-devel
 BuildRequires:  python
+BuildRequires:  yasm
+BuildRequires:  mesa-libGL-devel
 Requires:       thunderbird >= %{thunderbird_version}
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -97,16 +93,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
     > version.patch
 %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
 
-# Mozilla (XULRunner) patches
-cd mozilla
-%patch2 -p1 -b .jemalloc
-%patch3 -p2 -b .protected
-%patch4 -p2 -b .turbo
-%patch5 -p2 -b .mozcflags
-%patch6 -p1 -b .s390
-%patch9 -p1 -b .os2cc
-cd ..
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
@@ -182,6 +168,11 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* 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
+
 * Tue Jun 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.42.b3pre
 - Update to thunderbird 3.1.11 source
 - Drop notify patch, fixed upstream
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index d88a1c2..2c87f5d 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -30,8 +30,6 @@ ac_add_options --enable-system-hunspell
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
-ac_add_options --enable-static
-ac_add_options --enable-static-mail
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1