[thunderbird-lightning] Update to 1.4

[Jan Horak]

commit 244a1c7e155b222d6097408bad92ad88b8a8a601
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Apr 24 17:44:39 2012 +0200

    Update to 1.4

 .gitignore                 |    2 ++
 sources                    |    4 ++--
 thunderbird-lightning.spec |   11 +++++++----
 thunderbird-mozconfig      |    3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ac999a..06701b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 /lightning-1.2.1.source.tar.bz2
 /lightning-1.3.source.tar.bz2
 /l10n-1.3.tar.xz
+/lightning-1.4.source.tar.bz2
+/l10n-1.4.tar.xz
diff --git a/sources b/sources
index 4378dd4..3296c28 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-53ba1f293b1a5dd0cf8e4dc0743519ff  lightning-1.3.source.tar.bz2
-7ce2f0cd42fe38d1bb90ae6108f7274b  l10n-1.3.tar.xz
+74d3e1f5fe11d527ee009a4f602ad256  lightning-1.4.source.tar.bz2
+0823674d3453fc3cc61ab2046541c119  l10n-1.4.tar.xz
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index f5ad4b0..51235bb 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -5,8 +5,8 @@
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
 # Update these two as a pair - see calendar/lightning/install.rdf
-%global thunderbird_version 11.0
-%global thunderbird_next_version 12.0
+%global thunderbird_version 12.0
+%global thunderbird_next_version 13.0
 # Compatible versions are listed in:
 # comm-release/calendar/lightning/install.rdf.rej
 # comm-release/calendar/providers/gdata/install.rdf.rej
@@ -27,8 +27,8 @@
 
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
-Version:        1.3
-Release:        3%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -205,6 +205,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Tue Apr 24 2012 Jan Horak <jhorak at redhat.com> - 1.4-1
+- Update to 1.4
+
 * Fri Mar 16 2012 Martin Stransky <stransky at redhat.com> - 1.3-3
 - Thunderbird dependency fix
 
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index b61a679..9f314ef 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -23,7 +23,8 @@ ac_add_options --disable-xprint
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+# disable cairo, intree cairo has some patches which system cairo miss and this lead to compilation fail
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-system-hunspell