rpms/fcitx
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f16

Browse Source
This commit is contained in:
Fedora 2011-09-11 01:41:27 +08:00
commit c079690fbe
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fcitx.spec
View File

@ -5,7 +5,7 @@
Name: fcitx Name: fcitx
Summary: Free Chinese Input Toy for X (XIM) Summary: Free Chinese Input Toy for X (XIM)
Version: 4.1.1 Version: 4.1.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
URL: http://code.google.com/p/%{name}/ URL: http://code.google.com/p/%{name}/
@ -22,6 +22,7 @@ Requires: imsettings
Requires(post): %{_sbindir}/alternatives Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
%description %description
FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese 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 %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 * Fri Sep 09 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.1-1
- Upstream to fcitx-4.1.1 - Upstream to fcitx-4.1.1

13
xinput-fcitx
View File

@ -2,7 +2,14 @@ XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx XIM_PROGRAM=/usr/bin/fcitx
ICON="/usr/share/pixmaps/fcitx.png" ICON="/usr/share/pixmaps/fcitx.png"
XIM_ARGS="-D" XIM_ARGS="-D"
PREFERENCE_PROGRAM=/usr/bin/fcitx-config PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
SHORT_DESC="FCITX" SHORT_DESC="FCITX"
GTK_IM_MODULE=xim GTK_IM_MODULE=fcitx
QT_IM_MODULE=xim 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