rpms/scim/FC-3 scim.spec,1.12,1.13 xinput-scim,1.4,1.5

[Jens Petersen (petersen)]

Author: petersen

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

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



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scim.spec	1 Aug 2005 13:48:00 -0000	1.12
+++ scim.spec	23 Aug 2005 08:42:59 -0000	1.13
@@ -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}
@@ -95,6 +95,7 @@
 if [ "$1" = "0" ]; then
    for llcc in ja_JP ko_KR zh_CN zh_TW; do
       %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim
+      # if alternative was set to manual scim, reset to auto
       [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc
    done
 fi
@@ -129,8 +130,13 @@
 
 
 %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
-- modify the xinput alternatives settings
+- quote the postun readlink test (wcalee at myrealbox.com, #164674)
 
 * Mon Aug  1 2005 Jens Petersen <petersen at redhat.com> - 1.4.0-2.3
 - bring back the xinput alternatives settings for now


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/xinput-scim,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinput-scim	2 Aug 2005 02:39:15 -0000	1.4
+++ xinput-scim	23 Aug 2005 08:42:59 -0000	1.5
@@ -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