rpms/scim/FC-4 .cvsignore, 1.6, 1.7 scim.spec, 1.19, 1.20 sources, 1.4, 1.5 xinput-scim, 1.2, 1.3

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25048

Modified Files:
	.cvsignore scim.spec sources xinput-scim 
Log Message:
- update to 1.4.2 release
- source scim-qtimm script if present from scim xinput script
- reduce xinput.d alternatives priority to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Aug 2005 12:54:18 -0000	1.6
+++ .cvsignore	22 Aug 2005 05:32:55 -0000	1.7
@@ -1 +1 @@
-scim-1.4.0.tar.gz
+scim-1.4.2.tar.gz


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scim.spec	1 Aug 2005 14:09:22 -0000	1.19
+++ scim.spec	22 Aug 2005 05:32:55 -0000	1.20
@@ -1,7 +1,7 @@
 Name:      scim
-Version:   1.4.0
+Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   2.4%{?dist}
+Release:   0%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -83,7 +83,7 @@
 /sbin/ldconfig
 
 for llcc in ja_JP ko_KR zh_CN zh_TW; do
-   %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 85
+   %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81
 done
 
 %{_bindir}/update-gtk-immodules %{_target_platform}
@@ -130,6 +130,11 @@
 
 
 %changelog
+* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0
+- update to 1.4.2 release
+- source scim-qtimm script if present from scim xinput script
+- reduce xinput.d alternatives priority to 81
+
 * Mon Aug  1 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-2.4
 - quote the postun readlink test (wcalee at myrealbox.com, #164674)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jul 2005 08:18:09 -0000	1.4
+++ sources	22 Aug 2005 05:32:55 -0000	1.5
@@ -1 +1 @@
-9af14f5dc73435affb36b116ad77b53e  scim-1.4.0.tar.gz
+024cc7b98f68b56b23dd24535ec0388d  scim-1.4.2.tar.gz


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/xinput-scim,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinput-scim	29 Jul 2005 09:53:33 -0000	1.2
+++ xinput-scim	22 Aug 2005 05:32:55 -0000	1.3
@@ -2,3 +2,7 @@
 XIM_PROGRAM=scim
 XIM_ARGS="-d"
 GTK_IM_MODULE=scim
+
+SCIM_QTIMM_XINPUT=/etc/X11/xinit/xinput.d/scim-qtimm
+[ -r "${SCIM_QTIMM_XINPUT}" ] && . ${SCIM_QTIMM_XINPUT}
+unset SCIM_QTIMM_XINPUT