- add xinputd config

Changed files:
    scim.spec -> 1.11
    scim.xinputd -> 1.1

diff --git a/scim.spec b/scim.spec
index 2338f2db61148def4020b98ff870e6fd4e093235..9f1659cc06747720fc61cc5544e889691cf4d9b6 100644 (file)
--- a/scim.spec
+++ b/scim.spec
@@ -7,6 +7,7 @@ License:        LGPL v2+
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/scim/%{name}_%{version}.tar.gz
 # Source0-md5: 74a768e30c3b521e6c133be6359a868c
+Source1:       %{name}.xinputd
 URL:           http://www.scim-im.org/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
@@ -21,8 +22,6 @@ BuildRequires:        pkgconfig
 BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                immodulesdir    %{_libdir}/gtk-2.0/%(pkg-config --variable=gtk_binary_version gtk+-2.0)/immodules
-
 %description
 scim is the core package of the SCIM project, which provides the
 fundamental routines and data types. A GTK+ 2 based Panel (User
@@ -79,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
        gnomeccdir=%{_datadir}/gnome/capplets
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{immodulesdir}/im-scim.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/immodules/im-scim.{la,a}
 
 %find_lang %{name}
 
@@ -111,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/scim-1.0/scim-helper-manager
 %attr(755,root,root) %{_libdir}/scim-1.0/scim-launcher
 %attr(755,root,root) %{_libdir}/scim-1.0/scim-panel-gtk
-%attr(755,root,root) %{immodulesdir}/im-scim.so
+%attr(755,root,root) %{_libdir}/gtk-2.0/*/immodules/im-scim.so
 %dir %{_sysconfdir}/scim
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scim/config
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scim/global

diff --git a/scim.xinputd b/scim.xinputd
new file mode 100644 (file)
index 0000000..dcbfc79
--- /dev/null
+++ b/scim.xinputd
@@ -0,0 +1,30 @@
+XIM=SCIM
+XIM_PROGRAM=/usr/bin/scim
+XIM_ARGS=""
+ICON="/usr/share/scim/icons/trademark.png"
+PREFERENCE_PROGRAM=/usr/bin/scim-setup
+SHORT_DESC="SCIM"
+
+gtkimm_exists () {
+       # check if any immodules installed
+       for dir in /usr/@@LIB@@/gtk-2.0/*/immodules; do
+               [ -x ${dir}/im-$1.so ] && return 0
+       done
+       return 1
+}
+
+if gtkimm_exists scim-bridge; then
+       GTK_IM_MODULE=scim-bridge
+elif gtkimm_exists scim; then
+       GTK_IM_MODULE=scim
+else
+       GTK_IM_MODULE=xim
+fi
+
+if /usr/@@LIB@@/qt4/plugins/inputmethods/im-scim-bridge.so; then
+       QT_IM_MODULE=scim-bridge
+elif /usr/@@LIB@@/qt4/plugins/inputmethods/libqscim.so; then
+       QT_IM_MODULE=scim
+else
+       QT_IM_MODULE=xim
+fi