From 78c449f809d564b08c31a36ad53781d2da31a6177e6c9839085c2c581d0cb5b4 Mon Sep 17 00:00:00 2001
From: Fuminobu Takeyama <ftake@geeko.jp>
Date: Thu, 2 Apr 2015 15:13:45 +0000
Subject: [PATCH] Accepting request 294201 from home:ftake:branches:M17N

fix a bug and typo

OBS-URL: https://build.opensuse.org/request/show/294201
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=142
---
 ibus.changes | 10 +++++++++-
 ibus.spec    | 12 ++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ibus.changes b/ibus.changes
index 3080ddd..d8adf0d 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,7 +1,15 @@
+-------------------------------------------------------------------
+Sat Mar 28 09:30:59 UTC 2015 - ftake@geeko.jp
+
+- Fix boo#924696: settings of ibus engines are not saved
+  * Remove inappropriate %ghost from the dconf files
+- Disable appindicator for 13.1
+  * It requires Qt 5.3 to show icons specified by absolute path 
+
 -------------------------------------------------------------------
 Thu Mar 12 15:27:11 UTC 2015 - ftake@geeko.jp
 
-- Update to 1.5.9
+- Update to 1.5.10
   * Fix losing focus in/out on Google Chrome
   * Fix SEGV of ibus-ui-gtk3 caused by inappropriate 'preload-engines'
   * ibus-setup tries C locale to support environment without
diff --git a/ibus.spec b/ibus.spec
index 3489513..0a243da 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -259,6 +259,9 @@ intltoolize -f
            --enable-gtk-doc \
 %if %{with_wayland}
            --enable-wayland \
+%endif
+%if 0%{?suse_version} < 1320
+           --disable-appindicator \
 %endif
            --enable-surrounding-text \
            --libexecdir=%{_libdir}/ibus
@@ -366,11 +369,12 @@ dconf update
 %{_datadir}/pixmaps/ibus-keyboard.png
 %{_libdir}/ibus
 %{_datadir}/bash-completion/completions/ibus.bash
-%dir %config %{_sysconfdir}/dconf/db/ibus.d
-# These files are not config files. Users must not modify them.
-%ghost %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
+# This file is generated by dconf update
 %ghost %{_sysconfdir}/dconf/db/ibus
-%ghost %{_sysconfdir}/dconf/profile/ibus
+%dir %{_sysconfdir}/dconf/db/ibus.d
+# This file is not a config file. Users may not modify it.
+%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
+%{_sysconfdir}/dconf/profile/ibus
 %{_mandir}/man1/ibus.1.gz
 %{_mandir}/man1/ibus-daemon.1.gz
 %{_mandir}/man1/ibus-setup.1.gz