[thunderbird-lightning] Update l10n source hopefully to 1.1 release (bug #771860)
Orion Poplawski
orion at fedoraproject.org
Fri Jan 6 00:04:41 UTC 2012
commit c08f39ba2add42b84ecde1602c74d1293a8559ae
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Jan 5 17:04:38 2012 -0700
Update l10n source hopefully to 1.1 release (bug #771860)
.gitignore | 1 +
mklangsource.sh | 19 +++++++++++++------
sources | 2 +-
thunderbird-lightning.spec | 7 +++++--
4 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a313073..74dc057 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/lightning-1.0.source.tar.bz2
/lightning-1.1.source.tar.bz2
/l10n.tar.xz
+/l10n-1.1.tar.xz
diff --git a/mklangsource.sh b/mklangsource.sh
index d6c4df9..1b20901 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -1,21 +1,28 @@
#!/bin/bash
# This checks out and builds the language sources. The lightning source needs
# to already be unpacked
-locales=$PWD/thunderbird-lightning-1.1/comm-beta/calendar/locales/shipped-locales
+ver=`awk '/^Version:/ { print $2 }' thunderbird-lightning.spec`
+tag=CALENDAR_${ver/./_}_RELEASE
+locales=$PWD/thunderbird-lightning-${ver}/comm-beta/calendar/locales/shipped-locales
if [ ! -f $locale ]
then
echo "ERROR: missing $locales, try fedpkg prep first"
exit 1
fi
-rm -rf l10n
-mkdir l10n
+[ ! -d l10n ] && mkdir l10n
cd l10n
for lang in $(<$locales)
do
- hg clone http://hg.mozilla.org/releases/l10n/mozilla-aurora/$lang
+ if [ -d $lang ]
+ then
+ hg pull
+ hg update $tag
+ else
+ hg clone -u $tag http://hg.mozilla.org/releases/l10n/mozilla-release/$lang
+ fi
done
# Tar up, minus the mercurial files
cd ..
-rm -f l10n.tar.xz
-tar caf l10n.tar.xz --exclude='.hg*' l10n
+rm -f l10n-${ver}.tar.xz
+tar caf l10n-${ver}.tar.xz --exclude='.hg*' l10n
diff --git a/sources b/sources
index 004834c..03424d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
81c5c56c59c3ddd9b02a8a5edd7a3cf9 lightning-1.1.source.tar.bz2
-df152979d56a9e57c87a258690d78ac5 l10n.tar.xz
+e27b9456b2e28766c02873bd12a2fc31 l10n-1.1.tar.xz
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 80ef843..92b0b62 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -28,7 +28,7 @@
Name: thunderbird-lightning
Summary: The calendar extension to Thunderbird
Version: 1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.mozilla.org/projects/calendar/lightning/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Productivity
@@ -36,7 +36,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/r
#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.tar.xz
+Source2: l10n-%{version}.tar.xz
# Config file for compilation
Source10: thunderbird-mozconfig
# Finds requirements provided outside of the current file set
@@ -202,6 +202,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
#===============================================================================
%changelog
+* Thu Jan 5 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1-3
+- Update l10n source hopefully to 1.1 release (bug #771860)
+
* Thu Jan 05 2012 Dan HorĂ¡k <dan[at]danny.cz> - 1.1-2
- fix build on secondary arches (cherry-picked from 13afcd4c097c)
- disable jemalloc on s390(x) (taken from xulrunner)
More information about the scm-commits
mailing list