[thunderbird-lightning] - Update to 2.6.4 - Drop caldav patch

[Orion Poplawski]

commit 70f79bbfd5f22c965cbd537240860ab31fbffc89
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Dec 11 22:49:57 2013 -0700

    - Update to 2.6.4
    - Drop caldav patch

 .gitignore                         |    2 +
 sources                            |    4 +-
 thunderbird-lightning-caldav.patch |  115 ------------------------------------
 thunderbird-lightning.spec         |   19 +++---
 4 files changed, 13 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09a2dbc..5017676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@
 /thunderbird-24.1.0.source.tar.bz2
 /l10n-2.6.2.tar.xz
 /lightning-2.6.2.source.tar.bz2
+/lighting-2.6.4.source.tar.bz2
+/l10n-2.6.4.tar.xz
diff --git a/sources b/sources
index dfd3cf8..dc47c43 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39da7c856f5d1e91a7c5cdf37506d57e  lightning-2.6.2.source.tar.bz2
-64f4523fa6fa3f77c04d13f429906fff  l10n-2.6.2.tar.xz
+53d457a8ff97a305d975c20d1bebff04  lighting-2.6.4.source.tar.bz2
+54c4accc24b8cc608137b3b89d0999bf  l10n-2.6.4.tar.xz
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 0a4a8dd..3d3ee7d 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -5,10 +5,10 @@
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
 %global libvpx_version 1.0.0
-# Update these two as a pair - see calendar/lightning/install.rdf
-%global thunderbird_version 24.1.0
+# Update these two as a pair - see calendar/lightning/install.rdf and mail/config/version.txt
+%global thunderbird_version 24.2.0
 %global thunderbird_next_version 25.0
-%global lightning_version 2.6.2
+%global lightning_version 2.6.4
 # Bump one with each minor lightning release
 %global gdata_version 0.25
 # Compatible versions are listed in:
@@ -32,11 +32,11 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        %{lightning_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
-Source0:        http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/source/lightning-%{version}.source.tar.bz2
+Source0:        http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/%{version}/source/lighting-%{version}.source.tar.bz2
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunderbird_version}/source/thunderbird-%{thunderbird_version}.source.tar.bz2
 # This script will generate the language source below
 Source1:        mklangsource.sh
@@ -52,10 +52,6 @@ Patch1:         mozilla-build-arm.patch
 # Fix build on secondary arches (patches copied from xulrunner)
 Patch2:         xulrunner-10.0-secondary-ipc.patch
 
-# Fix caldav sync
-# https://bugzilla.mozilla.org/show_bug.cgi?id=930132
-Patch10:        thunderbird-lightning-caldav.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -130,7 +126,6 @@ cd mozilla
 %patch1 -p2 -b .arm-fix
 %patch2 -p3 -b .secondary-ipc
 cd ..
-%patch10 -p1 -b .caldav
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -232,6 +227,10 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Wed Dec 11 2013 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop caldav patch
+
 * Wed Nov 27 2013 Jan Horak <jhorak at redhat.com> - 2.6.2-5
 - Enable arm arch