[kdeplasma-addons] - kimpanel: omit ibus backend on f17+ FTBFS (#771115)

Rex Dieter rdieter at fedoraproject.org
Wed Jan 4 21:04:13 UTC 2012


commit f867a97e8aae4e24719369a5954c126ea508abb7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 4 15:04:00 2012 -0600

    - kimpanel: omit ibus backend on f17+ FTBFS (#771115)

 kdeplasma-addons.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 38c4de3..284ff68 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,3 +1,10 @@
+
+# kimpanel FTBFS against rawhide ibus
+# http://bugzilla.redhat.com/771115
+%if 0%{?fedora} < 17
+#define kimpanel_ibus 1
+%endif
+
 Name:    kdeplasma-addons
 Summary: Additional plasmoids for KDE
 Version: 4.7.97
@@ -24,7 +31,9 @@ BuildRequires: pkgconfig(eigen2)
 BuildRequires: marble-devel >= 1:%{version}
 %endif
 BuildRequires: pkgconfig(dbusmenu-qt)
+%if 0%{?kimpanel_ibus}
 BuildRequires: pkgconfig(ibus-1.0)
+%endif
 BuildRequires: pkgconfig(libattica)
 BuildRequires: pkgconfig(libkexiv2) >= 0.4.0
 BuildRequires: pkgconfig(libqalculate)
@@ -33,8 +42,6 @@ BuildRequires: pkgconfig(qimageblitz)
 # lancelot eye-candy
 BuildRequires: pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xrender)
 BuildRequires: qwt-devel
-# legacy scim-based kimpanel purposely omitted 
-#BuildRequires: scim-devel
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -76,7 +83,7 @@ Files for developing applications using %{name}.
 %package -n plasma-applet-kimpanel
 Summary: Plasma applet for input methods 
 %description -n plasma-applet-kimpanel
-%{summary}, including ibus.
+%{summary}%{?kimpanel_ibus:, including ibus}.
 
 %package -n plasma-wallpaper-marble
 Summary:  Marble wallpaper for kde-plasma 
@@ -360,7 +367,9 @@ fi
 %doc applets/kimpanel/COPYING
 %{_kde4_libdir}/kde4/plasma_engine_kimpanel.so
 %{_kde4_libdir}/kde4/plasma_applet_kimpanel.so
+%if 0%{?kimpanel_ibus}
 %{_kde4_libexecdir}/kimpanel-ibus-panel
+%endif
 %{_kde4_appsdir}/plasma/services/kimpanel.operations
 %{_kde4_datadir}/kde4/services/plasma-applet-kimpanel.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-kimpanel.desktop
@@ -377,6 +386,7 @@ fi
 %changelog
 * Wed Jan 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.7.97-1
 - 4.7.97
+- kimpanel: omit ibus backend on f17+ FTBFS (#771115)
 
 * Sat Dec 31 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-3
 - rebuild (attica)


More information about the scm-commits mailing list