Merge branch 'master' into f16
This commit is contained in:
commit
c079690fbe
@ -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@gmail.com> - 4.1.1-2
|
||||
- Update xinput-fcitx
|
||||
- Add fcitx-gtk3 as fcitx requires
|
||||
|
||||
* Fri Sep 09 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.1-1
|
||||
- Upstream to fcitx-4.1.1
|
||||
|
||||
|
13
xinput-fcitx
13
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user