[thunderbird-lightning] Use lightning 1.0b7 source for TB 7 Update l10n source Drop tbver patch

[Orion Poplawski]

commit a8fc65512d21e8d4cd69d9e20ecb12a7853c8522
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Sep 28 15:32:28 2011 -0600

    Use lightning 1.0b7 source for TB 7
    Update l10n source
    Drop tbver patch

 .gitignore                        |    2 ++
 mklangsource.sh                   |    7 ++-----
 sources                           |    4 ++--
 thunderbird-lightning-tbver.patch |   28 ----------------------------
 thunderbird-lightning.spec        |   23 +++++++++++++----------
 5 files changed, 19 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ee7c20..782e13e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /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
diff --git a/mklangsource.sh b/mklangsource.sh
index 25f33dd..964937e 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -15,9 +15,6 @@ do
   hg clone http://hg.mozilla.org/releases/l10n-miramar/$lang
 done
 
-# Cleanup repo info
-find . -name .hg\* | xargs rm -r
-
-# Tar up
+# Tar up, minus the mercurial files
 cd ..
-tar cjf l10n-miramar.tar.bz2 l10n-miramar
+tar cjf l10n-miramar.tar.bz2 --exclude='.hg*'  l10n-miramar
diff --git a/sources b/sources
index ab645cc..1f0c9c2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9ac741d238e95790cdeb5222e9b23ae8  thunderbird-6.0.source.tar.bz2
-480d8e2694a3491c97c6f2bf6038dc28  l10n-miramar.tar.bz2
+57bd09b31260f2608187c2c5637216fc  lightning-1.0b7.source.tar.bz2
+006fece04dcb0464ce7b7366737f314f  l10n-miramar.tar.bz2
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 7676d84..5451a4b 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -5,8 +5,11 @@
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
 # Update these two as a pair
-%global thunderbird_version 6.0
-%global thunderbird_next_version 7.0
+%global thunderbird_version 7.0
+%global thunderbird_next_version 8.0
+# Compatible versions are listed in:
+# comm-release/calendar/lightning/install.rdf.rej
+# comm-release/calendar/providers/gdata/install.rdf.rej
 %global moz_objdir objdir-tb
 %global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 %global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
@@ -25,13 +28,13 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        1.0
-Release:        0.49.b5%{?dist}
+Release:        0.50.b7%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
 #Someday lightning will produce a release we can use
-#Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/source/lightning-1.0b5-source.tar.bz2
-Source0:        http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunderbird_version}/source/thunderbird-%{thunderbird_version}.source.tar.bz2
+Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b7/source/lightning-1.0b7.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
 Source2:        l10n-miramar.tar.bz2
@@ -42,8 +45,6 @@ Source100:      find-external-requires
 
 # Mozilla (XULRunner) patches
 Patch0:         thunderbird-version.patch
-# Can the TB compatible version to 6.*
-Patch1:         thunderbird-lightning-tbver.patch
 # Fix build on secondary arches (patch copied from xulrunner)
 Patch2:         xulrunner-6.0-secondary-ipc.patch
 
@@ -98,7 +99,6 @@ calendaring tasks.
 
 %prep
 %setup -q -c -a 2
-%patch1 -p1 -b .tbver
 cd %{tarballdir}
 
 sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
@@ -154,8 +154,6 @@ cd objdir-tb/calendar/lightning
 make AB_CD=all L10N_XPI_NAME=lightning-all repack-clobber-all
 grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
 do
-   # Ski si for now
-   [ $lang = si ] && continue
    make AB_CD=all L10N_XPI_NAME=lightning-all libs-$lang
 done
 
@@ -194,6 +192,11 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* 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