[thunderbird-lightning] Update to 1.6
Jan Horak
xhorak at fedoraproject.org
Tue Jul 17 10:45:29 UTC 2012
commit e51ad3a15d8490ac472647ff0d85b4baabdaeae9
Author: Jan Horak <jhorak at redhat.com>
Date: Tue Jul 17 12:45:17 2012 +0200
Update to 1.6
.gitignore | 2 ++
sources | 4 ++--
thunderbird-lightning.spec | 15 ++++++++-------
xulrunner-prtime.patch | 12 ------------
4 files changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 060c62c..98f4f0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
/l10n-1.4.tar.xz
/lightning-1.5.source.tar.bz2
/l10n-1.5.tar.xz
+/lightning-1.6.source.tar.bz2
+/l10n-1.6.tar.xz
diff --git a/sources b/sources
index a2c4702..6b5d3b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-920bc146079a4f22e323bec528828fb1 lightning-1.5.source.tar.bz2
-040d507d84fe0b127eab6e74cc135872 l10n-1.5.tar.xz
+50bb241d7678ee36b58e4905ea58e008 l10n-1.6.tar.xz
+1ce7272293a7f4a3314f099aefe8aab2 lightning-1.6.source.tar.bz2
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 5df87b8..7eaebc4 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 13.0
-%global thunderbird_next_version 14.0
+%global thunderbird_version 14.0
+%global thunderbird_next_version 15.0
# Compatible versions are listed in:
# comm-release/calendar/lightning/install.rdf.rej
# comm-release/calendar/providers/gdata/install.rdf.rej
@@ -20,15 +20,15 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#global tarballdir .
-%global tarballdir comm-release
+%global tarballdir comm-beta
%global version_internal 2
%global mozappdir %{_libdir}/%{name}-%{version_internal}
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
-Version: 1.5
-Release: 2%{?dist}
+Version: 1.6
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
@@ -44,7 +44,6 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
-Patch1: xulrunner-prtime.patch
# Fix build on secondary arches (patches copied from xulrunner)
Patch2: xulrunner-10.0-secondary-ipc.patch
@@ -105,7 +104,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
cd mozilla
-%patch1 -p1 -b .prtime
%patch2 -p3 -b .secondary-ipc
cd ..
@@ -201,6 +199,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Tue Jul 17 2012 Jan Horak <jhorak at redhat.com> - 1.6-1
+- Update to 1.6
+
* Wed Jun 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.5-2
- Bump required TB version
More information about the scm-commits
mailing list