rpms/scim/devel scim.spec,1.120,1.121 xinput-scim,1.18,1.19

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3265

Modified Files:
	scim.spec xinput-scim 
Log Message:
- make xinput script no longer require multilib immodules
- remove the hacks in xinput script counting the number of IMEs




Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- scim.spec	16 Jun 2008 05:26:25 -0000	1.120
+++ scim.spec	1 Jul 2008 04:44:08 -0000	1.121
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   25%{?dist}
+Release:   26%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -303,6 +303,10 @@
 
 
 %changelog
+* Mon Jun 30 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-26.fc10
+- make xinput script no longer require multilib immodules
+- remove the hacks in xinput script counting the number of IMEs
+
 * Mon Jun 16 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-25.fc10
 - require imsettings instead of im-chooser
 


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xinput-scim	2 Apr 2008 07:27:42 -0000	1.18
+++ xinput-scim	1 Jul 2008 04:44:08 -0000	1.19
@@ -1,64 +1,37 @@
-# socket.so is not an IME
-IMENGINES=`ls /usr/lib*/scim-1.0/1.4.0/IMEngine | grep -v socket.so`
+XIM=SCIM
+XIM_PROGRAM=/usr/bin/scim
+XIM_ARGS=""
+PREFERENCE_PROGRAM=/usr/bin/scim-setup
+SHORT_DESC="SCIM"
 
-# check for m17n maps
-if echo $IMENGINES | grep -q m17n.so; then
-  if [ -z "`ls /usr/share/m17n/*.mim | grep -v global.mim`" ]; then
-     IMENGINES=`echo $IMENGINES | sed -e "s/m17n.so//"`
-  fi
-fi
-
-# check for scim-tables
-if echo $IMENGINES | grep -q table.so; then
-  if [ -z "`ls /usr/share/scim/tables`" ]; then
-     IMENGINES=`echo $IMENGINES | sed -e "s/table.so//"`
-  fi
-fi
-
-IMENGINE_NO=`echo $IMENGINES | wc -w`
-
-# start SCIM if have active IME(s) 
-if [ "$IMENGINE_NO" -ge 1 ]; then
-
-  XIM=SCIM
-  XIM_PROGRAM=/usr/bin/scim
-  XIM_ARGS=""
-  PREFERENCE_PROGRAM=/usr/bin/scim-setup
-  SHORT_DESC="SCIM"
-
-  gtkimm_exists () {
-	# for multilib check both immodules installed
+gtkimm_exists () {
+	# check if any immodules installed
 	for dir in /usr/lib*/gtk-2.0/immodules; do
-		[ ! -x ${dir}/im-$1.so ] && return 1
+		[ -x ${dir}/im-$1.so ] && return 0
 	done
-	return 0
+	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 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
 
-  qtimm_exists () {
-	# for multilib check both immodules installed
+qtimm_exists () {
+	# check if any immodule installed
 	for dir in /usr/lib*/qt4/plugins/inputmethods; do
-		[ ! -x ${dir}/$1.so ] && return 1
+		[ -x ${dir}/$1.so ] && return 0
 	done
-	return 0
+	return 1
 	}
 
-  if qtimm_exists im-scim-bridge; then
-    QT_IM_MODULE=scim-bridge
-  elif qtimm_exists libqscim; then
-    QT_IM_MODULE=scim
-  else
-    QT_IM_MODULE=xim
-  fi
-
+if qtimm_exists im-scim-bridge; then
+  QT_IM_MODULE=scim-bridge
+elif qtimm_exists libqscim; then
+  QT_IM_MODULE=scim
 else
-  echo "No SCIM IMEs found: SCIM startup was skipped."
-  . /etc/X11/xinit/xinput.d/none.conf
+  QT_IM_MODULE=xim
 fi