From 27bae1c70b9af1c949a292ef6ace3369ee60d1be557f2b695bcc9d7bd6d0b2ee Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 5 Oct 2012 08:54:52 +0000
Subject: [PATCH] Accepting request 136627 from
 home:dimstar:branches:GNOME:Factory

- Add with_ibus condition (currently set to 0), as we do not have
  a recent enough version of IBus in Factory at this moment.
  + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
    be used and --enable-ibus is being passed to configure
  + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
    and --disable-ibus is being passed to configure.

OBS-URL: https://build.opensuse.org/request/show/136627
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=144
---
 gnome-settings-daemon.changes | 10 ++++++++++
 gnome-settings-daemon.spec    | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index c1c21ae..20eaef7 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct  2 16:59:37 UTC 2012 - dimstar@opensuse.org
+
+- Add with_ibus condition (currently set to 0), as we do not have
+  a recent enough version of IBus in Factory at this moment.
+  + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
+    be used and --enable-ibus is being passed to configure
+  + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
+    and --disable-ibus is being passed to configure. 
+
 -------------------------------------------------------------------
 Tue Sep 25 14:34:37 UTC 2012 - dimstar@opensuse.org
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index b1d48d4..9194902 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -20,6 +20,9 @@
 # lose ConsoleKit support (bad for sysvinit)
 %define with_systemd 0
 
+# We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet.
+%define with_ibus 0
+
 Name:           gnome-settings-daemon
 Version:        3.6.0
 Release:        0
@@ -64,7 +67,9 @@ BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.5.3
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.5.90
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.3.18
 BuildRequires:  pkgconfig(gudev-1.0)
+%if %{with_ibus}
 BuildRequires:  pkgconfig(ibus-1.0) >= 1.4.99
+%endif
 BuildRequires:  pkgconfig(kbproto)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
@@ -150,7 +155,12 @@ autoreconf -f -i
         --enable-gconf-bridge \
         --disable-static \
         --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids \
-        --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0
+        --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
+%if %{with_ibus}
+        --enable-ibus
+%else
+        --disable-ibus
+%endif
 
 make %{?jobs:-j%jobs} V=1
 
@@ -180,7 +190,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
+%if %{with_ibus}
 %{_datadir}/dbus-1/services/org.freedesktop.IBus.service
+%endif
 %{_datadir}/gnome-settings-daemon/
 %{_datadir}/gnome-settings-daemon-3.0/
 %dir %{_libexecdir}/gnome-settings-daemon-3.0/