rpms/scim/devel scim.spec,1.96,1.97 xinput-scim,1.13,1.14

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim.spec xinput-scim 
Log Message:
source none.conf in xinput script when skipping scim startup



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- scim.spec	13 Sep 2007 09:58:17 -0000	1.96
+++ scim.spec	18 Sep 2007 04:14:54 -0000	1.97
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -290,6 +290,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
+- source none.conf in xinput script when skipping scim startup
+
 * Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
 - add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
   Sinhala (#236715)


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
+++ xinput-scim	18 Sep 2007 04:14:54 -0000	1.14
@@ -59,5 +59,6 @@
   fi
 
 else
-  echo No SCIM IMEs found: SCIM startup was skipped.
+  echo "No SCIM IMEs found: SCIM startup was skipped."
+  . /etc/X11/xinit/xinput.d/none.conf
 fi