From 36ed5609825fd910da06a281a2d755bd0875ba13 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Mon, 24 Apr 2017 08:51:14 +0200
Subject: [PATCH] update to 1.5.32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix error when starting emoji-picker when the “recently-used” does not yet exist
- Update emojione.json to version 3.0
- Add the data from CLDR common/annotationsDerived
- Load also the CLDR annotations from “annotationsDerived”
---
 .gitignore               |  1 +
 ibus-typing-booster.spec | 21 ++++++++++++++++-----
 sources                  |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52bc377..4c9ffe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@
 /ibus-typing-booster-1.5.29.tar.gz
 /ibus-typing-booster-1.5.30.tar.gz
 /ibus-typing-booster-1.5.31.tar.gz
+/ibus-typing-booster-1.5.32.tar.gz
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 21a7b57..c5cfab6 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -1,5 +1,5 @@
 Name:       ibus-typing-booster
-Version:    1.5.31
+Version:    1.5.32
 Release:    1%{?dist}
 Summary:    A completion input method
 License:    GPLv3+
@@ -69,16 +69,20 @@ make %{?_smp_mflags}
 export PYTHON=%{__python3}
 make install DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true  INSTALL="install -p"   pkgconfigdir=%{_datadir}/pkgconfig
 %if 0%{?fedora} >= 26
-    # These files are in the required packages “cldr-emoji-annotation”,
-    # “nodejs-emojione-json”
-    rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,json}
+    # These files are in the required package “cldr-emoji-annotation”
+    rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotations/*.xml
+    rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotationsDerived/*.xml
+    # These files are in the required package “nodejs-emojione-json”
+    rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.json
     # This file is in the required package “unicode-ucd”:
     rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/UnicodeData.txt
     # At least emoji-data.txt emoji-sequences.txt emoji-zwj-sequences.txt
     # are still there even on Fedora >= 26 they are not available in any packages:
     gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.txt
 %else
-    gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json}
+    gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{txt,json}
+    gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotations/*.xml
+    gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotationsDerived/*.xml
 %endif
 
 %find_lang %{name}
@@ -136,6 +140,13 @@ make check || cat ./tests/test-suite.log
 
 
 %changelog
+* Mon Apr 24 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.32-1
+- update to 1.5.32
+- Fix error when starting emoji-picker when the “recently-used” does not yet exist
+- Update emojione.json to version 3.0
+- Add the data from CLDR common/annotationsDerived
+- Load also the CLDR annotations from “annotationsDerived”
+
 * Tue Apr 18 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.31-1
 - update to 1.5.31
 - Rename option --use_vs16 to --non_fully_qualified
diff --git a/sources b/sources
index a968bce..7563404 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-typing-booster-1.5.31.tar.gz) = e8115bf418e5813526ceaf9973d2c7f0409103b4558f5deb01b058342c8858040cab20f635919a986c65a0e220fda3e9dcad8ba21b78824fe5f638ed965d0dc0
+SHA512 (ibus-typing-booster-1.5.32.tar.gz) = 0027d5b569577e3508a2af98c45929f63fea95369e6d502a42b3e3f61d28fb2c575ac42f5ae69c388d13a5740d35cbcda78ef01144679dc201bcbf384639290e