rpms/scim/FC-3 scim.spec,1.11,1.12

[Ryo Dairiki (ryo)]

Author: ryo

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

Modified Files:
	scim.spec 
Log Message:



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim.spec	1 Aug 2005 05:03:04 -0000	1.11
+++ scim.spec	1 Aug 2005 13:48:00 -0000	1.12
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.0
 # must be less than the release number of scim in Core
-Release:   2.3%{?dist}
+Release:   2.4%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -9,7 +9,6 @@
 URL:       http://www.scim-im.org/
 Source0:   http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 Source1:   xinput-scim
-Source2:   update-xinput-scim
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:    %{_bindir}/update-gtk-immodules
@@ -45,7 +44,7 @@
 
 %build
 %configure --disable-static
-# --disable-ld-version-script
+# 	--enable-ld-version-script
 make %{?_smp_mflags}
 
 
@@ -73,9 +72,6 @@
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
-# install update-xinput-scim script.
-install -pm 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim
-
 %find_lang %{name}
 
 
@@ -86,12 +82,23 @@
 %post
 /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
+done
+
 %{_bindir}/update-gtk-immodules %{_target_platform}
 
 
 %postun
 /sbin/ldconfig
 
+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
+      [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc
+   done
+fi
+
 %{_bindir}/update-gtk-immodules %{_target_platform}
 
 
@@ -122,11 +129,14 @@
 
 
 %changelog
-* Sat Jul 30 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-2.3
-- add update-xinput-scim
+* Mon Aug  1 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-2.4
+- modify the xinput alternatives settings
+
+* Mon Aug  1 2005 Jens Petersen <petersen at redhat.com> - 1.4.0-2.3
+- bring back the xinput alternatives settings for now
 
 * Sat Jul 30 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-2.2
-- disable ld-version-script, which used to enabled due to broken configure file
+- don't explicitly --disable-ld-version-script since this turns on versioning
 
 * Sat Jul 30 2005 Jens Petersen <petersen at redhat.com> - 1.4.0-2.1
 - own the system xinput.d dir