[thunderbird-lightning/f15] Use TB6 source Update l10n source, skipping si for now Drop patches fixed upstream Use Requires to m
Orion Poplawski
orion at fedoraproject.org
Fri Aug 19 16:58:54 UTC 2011
commit 50bb0584ce8fbc1bfe70bc53b7a305d1d4b9fcf4
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Aug 19 10:58:42 2011 -0600
Use TB6 source
Update l10n source, skipping si for now
Drop patches fixed upstream
Use Requires to match to thunderbird major version (bug #720709)
Add patch to change tb version compatibility to 6.*
.gitignore | 1 +
mklangsource.sh | 4 +-
sources | 4 +-
thunderbird-lightning-tbver.patch | 28 ++++++++++++++++
thunderbird-lightning.spec | 34 +++++++++++++-------
xulrunner-2.0-secondary-jit.patch | 14 --------
xulrunner-5.0-secondary-ipc.patch | 63 -------------------------------------
7 files changed, 55 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cbd150..3ee7c20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/thunderbird-5.0.source.tar.bz2
/lightning-1.0b5-source.tar.bz2
/l10n-miramar.tar.bz2
+/thunderbird-6.0.source.tar.bz2
diff --git a/mklangsource.sh b/mklangsource.sh
index 20b8f57..25f33dd 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# This checks out and builds the language sources. The lightning source needs
# to already be unpacked
-locales=$PWD/thunderbird-lightning-1.0/comm-miramar/calendar/locales/shipped-locales
+locales=$PWD/thunderbird-lightning-1.0/comm-release/calendar/locales/shipped-locales
if [ ! -f $locale ]
then
echo "ERROR: missing $locales, try fedpkg prep first"
@@ -20,4 +20,4 @@ find . -name .hg\* | xargs rm -r
# Tar up
cd ..
-tar cjf l10n-miramar.tar.gz l10n-miramar
+tar cjf l10n-miramar.tar.bz2 l10n-miramar
diff --git a/sources b/sources
index 95b335b..ab645cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d37b516ee9978531c428eb0e79a06098 lightning-1.0b5-source.tar.bz2
-bb1118994177f2bf408edc28ef5491d5 l10n-miramar.tar.bz2
+9ac741d238e95790cdeb5222e9b23ae8 thunderbird-6.0.source.tar.bz2
+480d8e2694a3491c97c6f2bf6038dc28 l10n-miramar.tar.bz2
diff --git a/thunderbird-lightning-tbver.patch b/thunderbird-lightning-tbver.patch
new file mode 100644
index 0000000..7ba628a
--- /dev/null
+++ b/thunderbird-lightning-tbver.patch
@@ -0,0 +1,28 @@
+diff -up thunderbird-lightning-1.0/comm-release/calendar/lightning/install.rdf.tbver thunderbird-lightning-1.0/comm-release/calendar/lightning/install.rdf
+--- thunderbird-lightning-1.0/comm-release/calendar/lightning/install.rdf.tbver 2011-08-12 07:52:04.000000000 -0600
++++ thunderbird-lightning-1.0/comm-release/calendar/lightning/install.rdf 2011-08-19 10:45:05.919915211 -0600
+@@ -11,8 +11,8 @@
+ <Description>
+ <!-- thunderbird -->
+ <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+- <em:minVersion>5.0b1</em:minVersion>
+- <em:maxVersion>5.*</em:maxVersion>
++ <em:minVersion>6.0</em:minVersion>
++ <em:maxVersion>6.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+diff -up thunderbird-lightning-1.0/comm-release/calendar/providers/gdata/install.rdf.tbver thunderbird-lightning-1.0/comm-release/calendar/providers/gdata/install.rdf
+--- thunderbird-lightning-1.0/comm-release/calendar/providers/gdata/install.rdf.tbver 2011-08-12 07:52:04.000000000 -0600
++++ thunderbird-lightning-1.0/comm-release/calendar/providers/gdata/install.rdf 2011-08-19 10:45:19.877427025 -0600
+@@ -58,8 +58,8 @@
+ <Description>
+ <!-- Thunderbird -->
+ <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+- <em:minVersion>5.0b1</em:minVersion>
+- <em:maxVersion>5.*</em:maxVersion>
++ <em:minVersion>6.0</em:minVersion>
++ <em:maxVersion>6.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <em:targetApplication>
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 9a6ccb9..c1ae0bf 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -4,7 +4,9 @@
%global freetype_version 2.1.9
%global sqlite_version 3.6.14
%global libnotify_version 0.4
-%global thunderbird_version 5.0
+# Update these two as a pair
+%global thunderbird_version 6.0
+%global thunderbird_next_version 7.0
%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}
@@ -15,7 +17,7 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#define tarballdir .
-%global tarballdir comm-miramar
+%global tarballdir comm-release
%global version_internal 5
%global mozappdir %{_libdir}/%{name}-%{version_internal}
@@ -23,12 +25,13 @@
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: 1.0
-Release: 0.47.b5rc3%{?dist}
+Release: 0.48.b5%{?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/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
# This script will generate the language source below
Source1: mklangsource.sh
Source2: l10n-miramar.tar.bz2
@@ -39,9 +42,8 @@ Source100: find-external-requires
# Mozilla (XULRunner) patches
Patch0: thunderbird-version.patch
-# secondary arch patches inherited from xulrunner
-Patch1: xulrunner-2.0-secondary-jit.patch
-Patch2: xulrunner-5.0-secondary-ipc.patch
+# Can the TB compatible version to 6.*
+Patch1: thunderbird-lightning-tbver.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
@@ -77,6 +79,7 @@ BuildRequires: python
BuildRequires: yasm
BuildRequires: mesa-libGL-devel
Requires: thunderbird >= %{thunderbird_version}
+Requires: thunderbird < %{thunderbird_next_version}
Obsoletes: thunderbird-lightning-wcap <= 0.8
Provides: thunderbird-lightning-wcap = %{version}-%{release}
AutoProv: 0
@@ -93,15 +96,13 @@ calendaring tasks.
%prep
%setup -q -c -a 2
+%patch1 -p1 -b .tbver
cd %{tarballdir}
sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-%patch1 -p1 -b .secondary-jit
-%patch2 -p1 -b .secondary-ipc
-
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -147,6 +148,8 @@ 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
@@ -185,10 +188,17 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
-* Fri Jul 29 2011 Orion Poplawski <orion at cora.nwra.com> 1.0.0.47.b5rc3
+* Thu Aug 18 2011 Orion Poplawski <orion at cora.nwra.com> - 1.0-0.48.b5
+- Use TB6 source
+- Update l10n source, skipping si for now
+- Drop patches fixed upstream
+- Use Requires to match to thunderbird major version (bug #720709)
+- Add patch to change tb version compatibility to 6.*
+
+* Fri Jul 29 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.47.b5rc3
- Package l10n langpacks (bug #504994)
-* Thu Jul 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0.0.46.b5rc3
+* Thu Jul 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.46.b5rc3
- Update to 1.0 b5 rc3
- Use lightning release sources
More information about the scm-commits
mailing list