Epoch 1 for gdata, fixed lightning langpacks

mklangsource.sh

@@ -22,13 +22,25 @@ do
     pushd $lang
     hg pull
     hg update $tag
+    #hg update
     popd
   else
     hg clone -u $tag http://hg.mozilla.org/releases/l10n/mozilla-release/$lang
+    #hg clone http://hg.mozilla.org/l10n-central/$lang
   fi
 done
+cd ..
+# Need to merge by compare-locale tool
+
+# Make copy to merge with
+rm -rf l10n-merged
+cp -R l10n l10n-merged
+for lang in $(<$locales)
+do
+  compare-locales --merge l10n-merged/$lang $PWD/thunderbird-${tbver}/${branch}/calendar/locales/l10n.ini l10n $lang
+done
+
 
 # Tar up, minus the mercurial files
-cd ..
 rm -f l10n-${lver}.tar.xz
-tar caf l10n-lightning-${tbver}.tar.xz --exclude='.hg*'  l10n
+tar caf l10n-lightning-${tbver}.tar.xz --exclude='.hg*'  l10n-merged

sources

@@ -1,3 +1,3 @@
 11ac8d03c4770c24ca7a697801aac373  thunderbird-langpacks-45.1.0-20160517.tar.xz
 ffd8dcef63986c75e197a51f82f2a723  thunderbird-45.1.0.source.tar.xz
-7851eee0bbc34666323cbdee1b3ea5db  l10n-lightning-45.1.0.tar.xz
+942f6cd44fe88432a0796feda75d9f53  l10n-lightning-45.1.0.tar.xz

thunderbird-mozconfig

@@ -33,7 +33,7 @@ ac_add_options --enable-pie
 
 # lightning related
 ac_add_options --enable-calendar
-ac_add_options --with-l10n-base=../../l10n
+ac_add_options --with-l10n-base=../../l10n-merged
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

thunderbird.spec

@@ -70,7 +70,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        45.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -194,8 +194,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 
 %package lightning-gdata
 Summary:        Lightning data provider for Google Calendar
-Version:        45.1.0%{gdata_version}.%{gdata_version_internal}
+Version:        %{gdata_version}.%{gdata_version_internal}
 Requires:       %{name}%{?_isa} = %{tb_version}-%{release}
+Epoch:          1
 
 %description lightning-gdata
 This extension allows Lightning to read and write events to a Google Calendar.
@@ -619,7 +620,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Tue May 17 2016 Jan Horak <jhorak@redhat.com> - 45.1.0-1
+* Tue May 17 2016 Jan Horak <jhorak@redhat.com> - 45.1.0-2
 - Update to 45.1.0
 
 * Wed Apr 27 2016 Peter Robinson <pbrobinson@fedoraproject.org> 45.0-4