From d155c9f745f89090cb569959f97779a740cc65f9 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Fri, 10 Mar 2017 15:20:42 +0100
Subject: [PATCH] update to 1.5.25
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- on Fedora 26, save some space in the binary rpm by requiring the
  Fedora packages which contain the emoji data files
- Update translations from zanata (de, pl, uk updated)
- Show the categories as well on right mouse click in emoji-picker
- Improve information displayed on right mouse click in emoji-picker
- html.unescape() the strings parsed from the cldr annotations
- Fix fontsize change for invisible emoji in browse flowbox
- Add an option whether the arrow keys are allowed to reopen a preëdit
- Add an option to work around the broken forward_key_event()
  in the Qt 4/5 im module
- Use xdg.BaseDirectory to add a USER_DATADIR to the
  search path for data for itb_emoji.py
- emoji_picker.py: Speedup: Fix wrong indentation of block
  in _fill_flowbox_browse()
- emoji_picker.py: Print some profiling information when debugging is enabled
- Store the clipboard with gtk_clipboard_store() to keep it around
  after emoji-picker quits
- emoji-picker: Do not override the decoration layout of the header bar
- When an emoji with a different skin tone is selected,
  replace the original emoji immediately
- Make emoji-picker work on dark themes like Adwaita-dark as well
---
 .gitignore               |  1 +
 ibus-typing-booster.spec | 42 ++++++++++++++++++++++++++++++++++++++--
 sources                  |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5e8900..bb55f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@
 /ibus-typing-booster-1.5.22.tar.gz
 /ibus-typing-booster-1.5.23.tar.gz
 /ibus-typing-booster-1.5.24.tar.gz
+/ibus-typing-booster-1.5.25.tar.gz
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 173fabd..004b436 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -1,5 +1,5 @@
 Name:       ibus-typing-booster
-Version:    1.5.24
+Version:    1.5.25
 Release:    1%{?dist}
 Summary:    A completion input method
 License:    GPLv3+
@@ -16,9 +16,17 @@ Requires:   python3-pyxdg
 # Recommend a reasonably good font which has most of the emoji:
 Recommends: gdouros-symbola-fonts
 %endif
+%if 0%{?fedora} >= 26
+# Save some space in the binary rpm by requiring the Fedora
+# packages which contain the emoji data files:
+Requires: cldr-emoji-annotation
+Requires: nodejs-emojione-json
+Requires: unicode-ucd
+%endif
 BuildRequires:  ibus-devel
 %if 0%{?fedora} >= 24
 BuildRequires:  python3-devel
+BuildRequires:  python3-pyxdg
 %else
 BuildRequires:  python34-devel
 %endif
@@ -59,7 +67,13 @@ make %{?_smp_mflags}
 %install 
 export PYTHON=%{__python3}
 make install DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true  INSTALL="install -p"   pkgconfigdir=%{_datadir}/pkgconfig
-gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json}
+%if 0%{?fedora} >= 26
+    # The data is in the required packages “cldr-emoji-annotation”,
+    # “nodejs-emojione-json” and “unicode-ucd”:
+    rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json}
+%else
+    gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json}
+%endif
 
 %find_lang %{name}
 
@@ -116,6 +130,30 @@ make check || cat ./tests/test-suite.log
 
 
 %changelog
+* Mon Mar 13 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.25-1
+- update to 1.5.25
+- on Fedora 26, save some space in the binary rpm by requiring the
+  Fedora packages which contain the emoji data files
+- Update translations from zanata (de, pl, uk updated, zh_CN new)
+- Show the categories as well on right mouse click in emoji-picker
+- Improve information displayed on right mouse click in emoji-picker
+- html.unescape() the strings parsed from the cldr annotations
+- Fix fontsize change for invisible emoji in browse flowbox
+- Add an option whether the arrow keys are allowed to reopen a preëdit
+- Add an option to work around the broken forward_key_event()
+  in the Qt 4/5 im module
+- Use xdg.BaseDirectory to add a USER_DATADIR to the
+  search path for data for itb_emoji.py
+- emoji_picker.py: Speedup: Fix wrong indentation of block
+  in _fill_flowbox_browse()
+- emoji_picker.py: Print some profiling information when debugging is enabled
+- Store the clipboard with gtk_clipboard_store() to keep it around
+  after emoji-picker quits
+- emoji-picker: Do not override the decoration layout of the header bar
+- When an emoji with a different skin tone is selected,
+  replace the original emoji immediately
+- Make emoji-picker work on dark themes like Adwaita-dark as well
+
 * Mon Mar 06 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.24-1
 - update to 1.5.24
 - Update translations from zanata (de updated)
diff --git a/sources b/sources
index a9f774e..f3ab176 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-typing-booster-1.5.24.tar.gz) = 4e342dea4e0113328af2d50b185043a3ec096cb7add322d517015639d7d5565e9e86b7dee067153443d4a7aaccb301e5b8e4943402b6110e185741d1a215c30a
+SHA512 (ibus-typing-booster-1.5.25.tar.gz) = 2eb91c75497b1deab12f6f350d09d7a070d0ab3886334b66dc28e5979e6c8b3e0f2d9a7fe52ed35c22d3c494207bc8d59e35cfa2b75fa8f5b4d290b9020dc8c5