rpms/uim/devel uim.spec,1.65,1.66 xinput.d-uim,1.4,1.5

[Akira TAGOH (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740

Modified Files:
	uim.spec xinput.d-uim 
Log Message:
* Tue Jul 15 2008 Akira TAGOH <tagoh at redhat.com> - 1.5.0-4
- Requires: imsettings instead of im-chooser.
- Add ICON parameter to uim.conf.
- Use Qt implementation of candidate window if the desktop
  session is KDE.
- set the appropriate immodule for multilib as scim does.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- uim.spec	14 Jul 2008 08:15:59 -0000	1.65
+++ uim.spec	17 Jul 2008 13:08:34 -0000	1.66
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -34,7 +34,7 @@
 Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
-Requires:	im-chooser >= 0.4.1-2.fc8
+Requires:	imsettings
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -510,6 +510,13 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Tue Jul 15 2008 Akira TAGOH <tagoh at redhat.com> - 1.5.0-4
+- Requires: imsettings instead of im-chooser.
+- Add ICON parameter to uim.conf.
+- Use Qt implementation of candidate window if the desktop
+  session is KDE.
+- set the appropriate immodule for multilib as scim does.
+
 * Mon Jul 14 2008 Akira TAGOH <tagoh at redhat.com> - 1.5.0-3
 - Add missing files. (#454957)
 


Index: xinput.d-uim
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/xinput.d-uim,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinput.d-uim	31 Jan 2008 02:33:16 -0000	1.4
+++ xinput.d-uim	17 Jul 2008 13:08:34 -0000	1.5
@@ -1,7 +1,44 @@
 XIM=uim
 XIM_PROGRAM=/usr/bin/uim-xim
-GTK_IM_MODULE=uim
-QT_IM_MODULE=uim
 SHORT_DESC=UIM
 PREFERENCE_PROGRAM=/usr/bin/uim-pref-gtk
 AUXILIARY_PROGRAM=/usr/bin/uim-toolbar-gtk-systray
+ICON=/usr/share/uim/pixmaps/uim-icon.png
+
+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 uim; then
+	GTK_IM_MODULE=uim
+else
+	GTK_IM_MODULE=xim
+fi
+
+qtimm_exists () {
+	# check if any immodule installed
+	for dir in /usr/lib*/qt4/plugins/inputmethods; do
+		[ -x ${dir}/$1.so ] && return 0
+	done
+	return 1
+}
+
+if qtimm_exists libuiminputcontextplugin; then
+	QT_IM_MODULE=uim
+else
+	QT_IM_MODULE=xim
+fi
+
+if [ "x$DESKTOP_SESSION" = "xkde" ]; then
+	if test -x /usr/libexec/uim-candwin-qt; then
+		UIM_CANDWIN_PROG=/usr/libexec/uim-candwin-qt
+		export UIM_CANDWIN_PROG
+	fi
+#	if test -x /usr/bin/uim-pref-qt; then
+#		PREFERENCE_PROGRAM=/usr/bin/uim-pref-qt
+#	fi
+fi