packages: scim/scim.spec, scim/scim.xinputd (NEW) - add xinputd config

[baggins]

Author: baggins                      Date: Sun Jul 24 16:39:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add xinputd config

---- Files affected:
packages/scim:
   scim.spec (1.10 -> 1.11) , scim.xinputd (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/scim/scim.spec
diff -u packages/scim/scim.spec:1.10 packages/scim/scim.spec:1.11
--- packages/scim/scim.spec:1.10	Sun Jul 24 18:07:55 2011
+++ packages/scim/scim.spec	Sun Jul 24 18:39:25 2011
@@ -8,6 +8,7 @@
 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
@@ -22,8 +23,6 @@
 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
@@ -80,7 +79,7 @@
 	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}
 
@@ -112,7 +111,7 @@
 %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
@@ -149,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/07/24 16:39:25  baggins
+- add xinputd config
+
 Revision 1.10  2011/07/24 16:07:55  baggins
 - up to 1.4.0
 - removed obsolete patches

================================================================
Index: packages/scim/scim.xinputd
diff -u /dev/null packages/scim/scim.xinputd:1.1
--- /dev/null	Sun Jul 24 18:39:31 2011
+++ packages/scim/scim.xinputd	Sun Jul 24 18:39:25 2011
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scim/scim.spec?r1=1.10&r2=1.11&f=u