From 421b67d34db9b563e74825e849d893c79bfd0185 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 12 2018 20:26:21 +0000
Subject: import thunderbird-60.2.1-4.el7_5


---

diff --git a/.gitignore b/.gitignore
index 8b7b44b..d6342fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 SOURCES/Python-2.7.13.tar.xz
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
+SOURCES/l10n-lightning-60.2.1.tar.xz
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-SOURCES/lightning-langpacks-60.3.0.tar.xz
-SOURCES/thunderbird-60.3.0.source.tar.xz
-SOURCES/thunderbird-langpacks-60.3.0-20181031.tar.xz
+SOURCES/thunderbird-60.2.1.source.tar.xz
+SOURCES/thunderbird-langpacks-60.2.1-20181003.tar.xz
 SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index a884d86..c18d07e 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,7 +1,7 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
+68f9529acf49d1d3b0970e3d81c60bf4ca4e4a3b SOURCES/l10n-lightning-60.2.1.tar.xz
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-b2961b9976d2970e3149f22bfeabd7437ecce3d4 SOURCES/lightning-langpacks-60.3.0.tar.xz
-3cfe85983a12f347d98407df3fdf2a13fa829bcd SOURCES/thunderbird-60.3.0.source.tar.xz
-3e12fbb6b37a8c14ee341ddc29ac3fb182d3aef2 SOURCES/thunderbird-langpacks-60.3.0-20181031.tar.xz
+c88a3c949756574b6c92631105a57238ce7c329c SOURCES/thunderbird-60.2.1.source.tar.xz
+82178960fd71e500d7d05793883b13f3eb3a1fd7 SOURCES/thunderbird-langpacks-60.2.1-20181003.tar.xz
 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/get-calendar-langpacks.sh b/SOURCES/get-calendar-langpacks.sh
deleted file mode 100755
index d3f5e86..0000000
--- a/SOURCES/get-calendar-langpacks.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-#set -x
-set -e
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script downloads calendar langpacks for Thunderbird.
-
-OPTIONS:
-   -h      Show this message
-   -v      Version string (7.0.1)
-   -b      Build number (1, 2, 3)
-   -r      Reuse downloaded files (when you don't want to redownload)
-EOF
-}
-
-VER=
-BUILDNUM=
-LANG_DATE=`date "+%Y%m%d"`
-while getopts “hv:b:r” OPTION
-do
-     case $OPTION in
-         h)
-             usage
-             exit 1
-             ;;
-         v)
-             VER=$OPTARG
-             ;;
-         b)
-             BUILDNUM=$OPTARG
-             ;;
-         ?)
-             usage
-             exit
-             ;;
-     esac
-done
-
-if [ -z "$VER" -o -z "$BUILDNUM"  ]
-then
-     echo "Missing version or build number."
-     usage
-     exit 1
-fi
-
-WHITE='\033[1;33m'
-NC='\033[0m' # No Color
-
-LOCALES=`curl -f https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/ | grep "a href"|sed -e "s|.*/\([^/]*\)/\".*|\1|"|tail -n+2 |grep -v xpi`
-#echo $LOCALES
-rm -rf lightning-langpacks
-mkdir -p lightning-langpacks
-cd lightning-langpacks
-LOCALE_COUNT=`echo $LOCALES| tr ' ' '\n' | wc -l`
-LOCALE_NUM=0
-for lang in $LOCALES; do
-  LOCALE_NUM=$((LOCALE_NUM+1))
-  echo -e "${WHITE}Processing calendar locale: $lang ($LOCALE_NUM/$LOCALE_COUNT)${NC}"
-  mkdir -p extracted_lightning
-  mkdir -p calendar-locales
-  #echo Downloading TB binary for locale: $lang
-  wget --quiet https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/$lang/thunderbird-$VER.tar.bz2
-
-  cd extracted_lightning
-  tar -xf ../thunderbird-$VER.tar.bz2 thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
-  set +e
-  unzip -qq thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
-  set -e
-  LIGHTNING_VERSION=`cat app.ini |grep "^Version="|sed -e 's/Version=//'`
-  BUILD_ID=`cat app.ini |grep "^BuildID="|sed -e 's/BuildID=//'`
-  MAX_VERSION=`cat app.ini |grep MaxVersion|sed -e s/MaxVersion=//`
-  MIN_VERSION=`cat app.ini |grep MinVersion|sed -e s/MinVersion=//`
-  rm -rf thunderbird
-  mkdir -p ../calendar-locales/chrome
-  cp -r chrome/calendar-$lang ../calendar-locales/chrome
-  cp -r chrome/lightning-$lang ../calendar-locales/chrome
-  cd -
-
-  cd calendar-locales
-  # create manifest
-  cat > manifest.json <<EOL
-{
-  "languages": {
-    "$lang": {
-      "chrome_resources": {
-        "calendar": "chrome/calendar-$lang/locale/$lang/calendar/",
-        "lightning": "chrome/lightning-$lang/locale/$lang/lightning/"
-      },
-      "version": "$LIGHTNING_VERSION"
-    }
-  },
-  "applications": {
-    "gecko": {
-      "strict_min_version": "$MIN_VERSION",
-      "id": "langpack-cal-$lang@lightning.mozilla.org",
-      "strict_max_version": "$MAX_VERSION"
-    }
-  },
-  "langpack_id": "$lang",
-  "version": "$LIGHTNING_VERSION$BUILD_ID",
-  "name": "$lang Language Pack Calendar",
-  "manifest_version": 2,
-  "sources": {
-    "browser": {
-      "base_path": "browser/"
-    }
-  },
-  "author": "Mozilla.cz (contributors: Pavel Cvrček, Pavel Franc, Michal Stanke, Michal Vašíček)",
-  "description": "Language pack for Thunderbird for $lang, this was repacked by Fedora/RHEL package maintainer from original binaries."
-}
-
-EOL
-  zip --quiet -r ../langpack-cal-$lang@lightning.mozilla.org.xpi *
-  cd -
-  rm -rf calendar-locales
-  rm -rf extracted_lightning
-
-  rm -f thunderbird-$VER.tar.bz2
-done
-echo "Creating lightning-langpacks-$VER.tar.xz..."
-tar cJf ../lightning-langpacks-$VER.tar.xz *.xpi
-cd ..
-rm -rf lightning-langpacks
diff --git a/SOURCES/gtk3-private-3.22.26-1-files.inc b/SOURCES/gtk3-private-3.22.26-1-files.inc
index 8e1e31a..cf89c66 100644
--- a/SOURCES/gtk3-private-3.22.26-1-files.inc
+++ b/SOURCES/gtk3-private-3.22.26-1-files.inc
@@ -40,7 +40,6 @@
 %{gtk3_install_path}/%{_lib}/gio
 %ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gio/modules/giomodule.cache
 %{gtk3_install_path}/%{_lib}/gtk-3.0
-%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gtk-3.0/3.0.0/immodules.cache
 
 %{gtk3_install_path}/libexec
 
diff --git a/SOURCES/mklangsource.sh b/SOURCES/mklangsource.sh
new file mode 100755
index 0000000..fd2205f
--- /dev/null
+++ b/SOURCES/mklangsource.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# 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`
+#tag=CALENDAR_${lver//./_}_RELEASE
+tag=THUNDERBIRD_${tbver//./_}_RELEASE
+branch=`awk '/^%define *tarballdir/ { print $3; exit }' thunderbird.spec`
+locales=$PWD/thunderbird-${tbver}/${branch}/comm/calendar/locales/shipped-locales
+#locales=$PWD/shipped-locales
+if [ ! -f $locales ]
+then
+  echo "ERROR: missing $locales, try fedpkg prep first"
+  exit 1
+fi
+[ ! -d l10n ] && mkdir l10n
+cd l10n
+for lang in $(<$locales)
+do
+  if [ -d $lang ]
+  then
+    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
+# More info here: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/compare-locales
+# how to get compare-locales: sudo easy_install -U compare-locales
+
+# 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}/comm/calendar/locales/l10n.ini l10n $lang
+done
+
+
+# Tar up, minus the mercurial files
+rm -f l10n-${lver}.tar.xz
+tar caf l10n-lightning-${tbver}.tar.xz --exclude='.hg*'  l10n-merged
diff --git a/SOURCES/thunderbird-mozconfig b/SOURCES/thunderbird-mozconfig
index c304223..efada3a 100644
--- a/SOURCES/thunderbird-mozconfig
+++ b/SOURCES/thunderbird-mozconfig
@@ -15,6 +15,7 @@ ac_add_options --enable-release
 ac_add_options --enable-startup-notification
 ac_add_options --libdir="$LIBDIR"
 ac_add_options --prefix="$PREFIX"
+ac_add_options --with-l10n-base=../../l10n-merged
 ac_add_options --without-system-libvpx
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 61d6bb4..e42beda 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -89,8 +89,8 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        60.3.0
-Release:        1%{?dist}
+Version:        60.2.1
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -105,11 +105,11 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20181031.tar.xz
-# Locales for lightning
-Source2:        lightning-langpacks-%{version}.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20181003.tar.xz
 %endif
-Source3:        get-calendar-langpacks.sh
+# Locales for lightning
+Source2:        l10n-lightning-%{version}.tar.xz
+Source3:        mklangsource.sh
 
 Source10:       thunderbird-mozconfig
 Source20:       thunderbird.desktop
@@ -719,6 +719,16 @@ export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 export STRIP=/bin/true
 ./mach build -v
 
+# Package l10n files
+cd objdir/comm/calendar/lightning
+grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
+do
+   make AB_CD=en-US L10N_XPI_NAME=lightning libs-$lang
+done
+# install l10n files
+make tools
+cd -
+
 #---------------------------------------------------------------------
 
 %install
@@ -854,12 +864,6 @@ function create_default_langpack() {
 #create_default_langpack "pt-PT" "pt"
 #create_default_langpack "sv-SE" "sv"
 #create_default_langpack "zh-TW" "zh"
-
-# lightning langpacks install
-cd %{buildroot}%{langpackdir}
-%{__tar} xf %{SOURCE2}
-chmod a+r *.xpi
-cd -
 %endif # build_langpacks
 
 # Get rid of devel package and its debugsymbols
@@ -985,13 +989,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Wed Oct 31 2018 Jan Horak <jhorak@redhat.com> - 60.3.0-1
-- Update to 60.3.0
-
-* Wed Oct 31 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-6
-- Fixed missing calendar langpacks
-
-* Tue Oct 16 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-5
+* Tue Oct 16 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-4
 - Fixing minor issues
 
 * Wed Oct 10 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-3