rpms/uim/FC-5 uim.spec,1.27,1.28

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/uim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13491

Modified Files:
	uim.spec 
Log Message:
* Fri Jul  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.1-1
- New upstream release.
- use %%{_host} not %%{_target_platform} for update-gtk-immodules.
- removed the unnecessary %%post and %%postun.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-5/uim.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- uim.spec	19 Jun 2006 08:48:15 -0000	1.27
+++ uim.spec	7 Jul 2006 05:48:07 -0000	1.28
@@ -1,9 +1,10 @@
 %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 gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_host} || :) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules || :)
 
 Name:		uim
-Version:	1.1.0
+Version:	1.1.1
 Release:	1%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
@@ -150,7 +151,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}
@@ -200,9 +200,7 @@
 
 %postun gtk2
 umask 022
-if [ $1 = 0 ]; then
-	%{gtk_im_update}
-fi
+%{gtk_im_update}
 
 %post gnome
 bonobo-activation-sysconf --add-directory=%{_libdir}/bonobo/servers > /dev/null
@@ -210,45 +208,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 +300,11 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Fri Jul  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.1-1
+- New upstream release.
+- use %%{_host} not %%{_target_platform} for update-gtk-immodules.
+- removed the unnecessary %%post and %%postun.
+
 * Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
 - New upstream release.