rpms/uim/devel uim.spec,1.27,1.28

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
* Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-2
- use %%{_host} not %%{_target_platform} for update-gtk-immodules.
- add PreReq: gtk2 >= 2.9.1-2 and ignore update-gtk-immodules errors.
- follow the new xinput.sh and added Requires: xorg-x11-xinit >= 1.0.2-5.fc6.
- removed the unnecessary %%post and %%postun.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- uim.spec	19 Jun 2006 08:40:48 -0000	1.27
+++ uim.spec	5 Jul 2006 09:24:04 -0000	1.28
@@ -1,10 +1,9 @@
-%define uim_locale ja_JP ko_KR vi_VN zh_CN zh_TW
-%define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
-%define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
+%define inst_xinput alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim 50
+%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim
 
 Name:		uim
 Version:	1.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +20,7 @@
 Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
+Requires:	xorg-x11-xinit >= 1.0.2-5.fc6
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -33,6 +33,8 @@
 Requires:	uim = %{version}-%{release}
 Requires(post):	gtk2
 Requires(postun): gtk2
+# for update-gtk-immodules
+PreReq:		gtk2 >= 2.9.1-2
 
 %package	gnome
 Summary:	GNOME Applet for Uim
@@ -150,7 +152,6 @@
 This package provides support for m17n-lib, which allows input of
 many languages using the input table map from m17n-db.
 
-%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -196,13 +197,11 @@
 
 %post gtk2
 umask 022
-%{gtk_im_update}
+%{_bindir}/update-gtk-immodules %{_host} || :
 
 %postun gtk2
 umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
+%{_bindir}/update-gtk-immodules %{_host} || :
 
 %post gnome
 bonobo-activation-sysconf --add-directory=%{_libdir}/bonobo/servers > /dev/null
@@ -210,45 +209,6 @@
 %postun gnome
 bonobo-activation-sysconf --remove-directory=%{_libdir}/bonobo/servers
 
-%post	anthy
-umask 022
-%{gtk_im_update}
-
-%postun	anthy
-umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
-
-%post	canna
-umask 022
-%{gtk_im_update}
-
-%postun	canna
-umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
-
-%post	skk
-umask 022
-%{gtk_im_update}
-
-%postun	skk
-umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
-
-%post	m17n
-umask 022
-%{gtk_im_update}
-
-%postun m17n
-umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -341,6 +301,12 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-2
+- use %%{_host} not %%{_target_platform} for update-gtk-immodules.
+- add PreReq: gtk2 >= 2.9.1-2 and ignore update-gtk-immodules errors.
+- follow the new xinput.sh and added Requires: xorg-x11-xinit >= 1.0.2-5.fc6.
+- removed the unnecessary %%post and %%postun.
+
 * Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
 - New upstream release.