[kdeplasma-addons] reenable kimpanel ibus backend

[Kevin Kofler]

commit d153332a931efacc11dc031bdc02f81edbab0d60
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 10 20:08:07 2012 +0100

    reenable kimpanel ibus backend
    
    * Sat Mar 10 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.1-2
    - reenable kimpanel ibus backend

 kdeplasma-addons.spec |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 1e2047d..6bece8b 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,14 +1,7 @@
-
-# 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.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -37,9 +30,7 @@ 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)
@@ -87,9 +78,9 @@ Requires: plasma-devel
 Files for developing applications using %{name}.
 
 %package -n plasma-applet-kimpanel
-Summary: Plasma applet for input methods 
+Summary: Plasma applet for input methods
 %description -n plasma-applet-kimpanel
-%{summary}%{?kimpanel_ibus:, including ibus}.
+%{summary}, including ibus.
 
 %package -n plasma-wallpaper-marble
 Summary:  Marble wallpaper for kde-plasma 
@@ -375,9 +366,7 @@ 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
@@ -392,6 +381,9 @@ fi
 
 
 %changelog
+* Sat Mar 10 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.1-2
+- reenable kimpanel ibus backend
+
 * Mon Mar 05 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-1
 - 4.8.1