From 6098dc3e6a9229bb50ea756819e9783c4cd3c4232ec54fcd230425c63f72f786 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 25 May 2017 21:53:38 +0000
Subject: [PATCH] Accepting request 498209 from home:ftake:branches:M17N

Add is_opensuse switch for Wayland.
python-gobject-devel came back again to Tumbleweed. So no change in spec file

OBS-URL: https://build.opensuse.org/request/show/498209
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=162
---
 ibus-1.5.14.tar.gz |  3 ---
 ibus-1.5.16.tar.gz |  3 +++
 ibus.changes       | 20 ++++++++++++++++++++
 ibus.spec          | 17 +++++------------
 4 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 ibus-1.5.14.tar.gz
 create mode 100644 ibus-1.5.16.tar.gz

diff --git a/ibus-1.5.14.tar.gz b/ibus-1.5.14.tar.gz
deleted file mode 100644
index 176466b..0000000
--- a/ibus-1.5.14.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c
-size 2214350
diff --git a/ibus-1.5.16.tar.gz b/ibus-1.5.16.tar.gz
new file mode 100644
index 0000000..91f0c6a
--- /dev/null
+++ b/ibus-1.5.16.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36b57bfbe4f92e3281fb535cae65794b6f25164b2a3288e73e6d06b4a409fe1e
+size 2375719
diff --git a/ibus.changes b/ibus.changes
index cfe41d8..d6022df 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed May 24 14:00:34 UTC 2017 - ftake@geeko.jp
+
+- Update to 1.5.16
+  * Implement shortcut keys on emoji dialog
+  * Move language settings from IBusEmojier to ibus-setup
+  * Improve `ibus emoji` command to work on Wayland
+  * Emoji-related improvements
+  * Add man page of `ibus emoji` command
+- Update to 1.5.15
+  * Fix memory leaks
+  * Fix warnings during resizing panel
+  * Improve emoji lookup window
+  * Support scrill event in GTK3 candidate panel
+  * Avoid emoji typing during Unicode typing
+  * Fix potential buffer overrun in CreateNestedListi()
+  * Set emoji preview text on font setting
+  * Add `ibus emoji` command
+- Clean up spec file
+
 -------------------------------------------------------------------
 Sun Mar 12 14:41:40 UTC 2017 - dimstar@opensuse.org
 
diff --git a/ibus.spec b/ibus.spec
index 928373f..c0688ac 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -17,20 +17,16 @@
 
 
 %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)
-%if 0%{?suse_version} == 1315
-%define with_python3 0
-%else
 # temporary disable, 'coz ibus is not python3 ready
 %define with_python3 0
-%endif
-%if 0%{?suse_version} > 1315
+%if 0%{?is_opensuse}
 %define with_wayland 1
 %else
 %define with_wayland 0
 %endif
 
 Name:           ibus
-Version:        1.5.14
+Version:        1.5.16
 Release:        0
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1+
@@ -76,7 +72,7 @@ BuildRequires:  dconf-devel >= 0.7.5
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  gettext-devel
-BuildRequires:  glib2-devel >= 2.26.0
+BuildRequires:  glib2-devel >= 2.34.0
 BuildRequires:  gobject-introspection-devel >= 0.9.6
 BuildRequires:  gtk-doc >= 1.9
 BuildRequires:  gtk2-devel
@@ -109,11 +105,8 @@ BuildRequires:  pkgconfig(wayland-client) >= 1.2.0
 %endif
 # BuildRequires:  nodejs-emojione
 BuildRequires:  pkgconfig(xkbcommon)
-# It seems that old vala compiler cannot build with an incompatible
-# return type error among two overriding functions with
-# "GLib.Variant?" type
-# 13.1 support should be dropped after the cause is confirmed
-BuildRequires:  vala >= 0.26.0
+# copy_deep method is supported since 0.31.1
+BuildRequires:  vala >= 0.31.1
 Requires:       dbus-1-python
 Requires:       dconf
 Requires:       iso-codes