From 752bb289dd42235941dfa390cb7983ea81b5135a Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Nov 28 2016 15:12:16 +0000
Subject: Update to 45.5.0


---

diff --git a/.gitignore b/.gitignore
index dfc99b1..0d4d94d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-45.4.0.source.tar.xz
 /thunderbird-langpacks-45.4.0-20161006.tar.xz
 /l10n-lightning-45.4.0.tar.xz
+/thunderbird-45.5.0.source.tar.xz
+/thunderbird-langpacks-45.5.0-20161128.tar.xz
+/l10n-lightning-45.5.0.tar.xz
diff --git a/mklangsource.sh b/mklangsource.sh
index 289cdc0..4269457 100755
--- a/mklangsource.sh
+++ b/mklangsource.sh
@@ -2,11 +2,14 @@
 # This checks out and builds the language sources.  The lightning source needs
 # to already be unpacked
 #lver=`awk '/^%global *lightning_ver/ { print $3; exit }' thunderbird.spec`
-tbver=`awk '/^Version:/ { print $2; exit }' thunderbird.spec`
+set -x
+#tbver=`awk '/^Version:/ { print $2; exit }' thunderbird.spec`
+tbver=`rpmspec -P thunderbird.spec |awk '/^Version:/ { print $2; exit }'`
 #tag=CALENDAR_${lver//./_}_RELEASE
 tag=THUNDERBIRD_${tbver//./_}_RELEASE
-branch=`awk '/^%define *tarballdir/ { print $3; exit }' thunderbird.spec`
-locales=$PWD/thunderbird-${tbver}/${branch}/calendar/locales/shipped-locales
+branch=`rpmspec -P thunderbird.spec | awk '/^%define *tarballdir/ { print $3; exit }'`
+#locales=$PWD/thunderbird-${tbver}/${branch}/calendar/locales/shipped-locales
+locales=$PWD/thunderbird-${tbver}/thunderbird-${tbver}/calendar/locales/shipped-locales
 #locales=$PWD/shipped-locales
 if [ ! -f $locales ]
 then
@@ -39,7 +42,7 @@ 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
+  compare-locales --merge l10n-merged/$lang $PWD/thunderbird-${tbver}/thunderbird-${tbver}/calendar/locales/l10n.ini l10n $lang
 done
 
 
diff --git a/sources b/sources
index 1835d55..261a4ed 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f90365e69f33efa8c2e69bbc6bb5b3a3  thunderbird-45.4.0.source.tar.xz
-7c4481aa0997987c0bc0afcc3f58a6ac  thunderbird-langpacks-45.4.0-20161006.tar.xz
-30259ce57a08bbb3d3d07b1211438006  l10n-lightning-45.4.0.tar.xz
+39b50c7659fa106eb53e5ea4c8bc7b2a  thunderbird-45.5.0.source.tar.xz
+e92431520b10b44282668c43089b6636  thunderbird-langpacks-45.5.0-20161128.tar.xz
+6f9f117950df1509b7441f010c9e09e3  l10n-lightning-45.5.0.tar.xz
diff --git a/thunderbird.spec b/thunderbird.spec
index ee978ff..6b74fff 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -42,10 +42,15 @@
 %define system_libvpx      0
 %endif
 
+%define tb_version 45.5.0
+
+%define tarballdir   thunderbird-%{tb_version}
+
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 # Bump one with each minor lightning release
 %define gdata_version 2.6
-%define gdata_version_internal 0.8
+# BUMP VERSION THERE:
+%define gdata_version_internal 0.9
 %global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 
 # The tarball is pretty inconsistent with directory structure.
@@ -55,7 +60,6 @@
 # set to the cwd, ie: '.'
 %define objdir       objdir
 %define mozappdir    %{_libdir}/%{name}
-%define tarballdir   thunderbird-45.4.0
 
 %define official_branding 1
 # enable crash reporter only for iX86
@@ -68,14 +72,14 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        45.4.0
+Version:        45.5.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20161006.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20161128.tar.xz
 %endif
 # Locales for lightning
 Source2:        l10n-lightning-%{version}.tar.xz
@@ -616,6 +620,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Nov 28 2016 Jan Horak <jhorak@redhat.com> - 45.5.0-1
+- Update to 45.5.0
+
 * Thu Oct  6 2016 Jan Horak <jhorak@redhat.com> - 45.4.0-1
 - Update to 45.4.0