[fcitx] Update fcitx.spec and xinput-fcitx

[Liang Suilong]

commit e7f04fc02e03b3530062b35c5ae958ff25eb4263
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sun Sep 11 01:28:40 2011 +0800

    Update fcitx.spec and xinput-fcitx

 fcitx.spec   |    7 ++++++-
 xinput-fcitx |   13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
index 431b80e..d9982a4 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.1.1
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -22,6 +22,7 @@ Requires:		imsettings
 Requires(post):		%{_sbindir}/alternatives
 Requires(postun):	%{_sbindir}/alternatives
 Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-gtk3 = %{version}-%{release}
 
 %description
 FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese 
@@ -247,6 +248,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Fri Sep 09 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.1-2
+- Update xinput-fcitx
+- Add fcitx-gtk3 as fcitx requires
+
 * Fri Sep 09 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.1-1
 - Upstream to fcitx-4.1.1
 
diff --git a/xinput-fcitx b/xinput-fcitx
index 1eb5a4d..a597cdb 100644
--- a/xinput-fcitx
+++ b/xinput-fcitx
@@ -2,7 +2,14 @@ XIM=fcitx
 XIM_PROGRAM=/usr/bin/fcitx
 ICON="/usr/share/pixmaps/fcitx.png"
 XIM_ARGS="-D"
-PREFERENCE_PROGRAM=/usr/bin/fcitx-config
+PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
 SHORT_DESC="FCITX"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim
+GTK_IM_MODULE=fcitx
+if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \
+   test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so;
+then
+    QT_IM_MODULE=fcitx
+else
+    QT_IM_MODULE=xim
+fi
+