From ba99db5fb5f40d5c10885838231b1d307e64b884 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Fri, 22 Feb 2019 19:17:45 +0900
Subject: [PATCH] Update ibus.spec to delete GConf dependencies

---
 ibus.spec | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ibus.spec b/ibus.spec
index 6592993..8ba582d 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,7 +35,7 @@
 
 Name:           ibus
 Version:        1.5.19
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -62,14 +62,16 @@ BuildRequires:  dconf-devel
 BuildRequires:  dbus-x11
 BuildRequires:  python3-devel
 BuildRequires:  python3-gobject
+%if %with_python2
 # https://bugzilla.gnome.org/show_bug.cgi?id=759334
 # Need python2 for gsettings-schema-convert
 BuildRequires:  python2-devel
-BuildRequires:  vala
 # for AM_GCONF_SOURCE_2 in configure.ac
 BuildRequires:  GConf2-devel
-BuildRequires:  git
 BuildRequires:  intltool
+%endif
+BuildRequires:  git
+BuildRequires:  vala
 BuildRequires:  iso-codes-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libwayland-client-devel
@@ -292,7 +294,11 @@ done
 install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
 # install .desktop files
+%if %with_python2
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
+%else
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/org.freedesktop.IBus.Setup.desktop
+%endif
 #echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%%{_sysconfdir}/xdg/autostart/ibus.desktop
 
 desktop-file-install --delete-original          \
@@ -388,7 +394,11 @@ dconf update || :
 # gtk-update-icon-cache is executed in the main package only one time.
 %files setup
 %{_bindir}/ibus-setup
+%if %with_python2
 %{_datadir}/applications/ibus-setup.desktop
+%else
+%{_datadir}/applications/org.freedesktop.IBus.Setup.desktop
+%endif
 %{_datadir}/ibus/setup
 %{_datadir}/man/man1/ibus-setup.1.gz
 
@@ -424,6 +434,10 @@ dconf update || :
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Feb 22 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-17
+- Delete dconf dependencies and gettext migration for gschema.xml file
+- Delete Super-space notification in initial login in non-GNOME desktops
+
 * Tue Feb 05 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-16
 - Resolves: #1671286 wrong mutex