rpms/uim/FC-4 .cvsignore, 1.12, 1.13 sources, 1.11, 1.12 uim.spec, 1.20, 1.21

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Fri Jul  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.1-1
- New upstream release.
- removed the unnecessary %%post and %%postun.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	19 Jun 2006 08:55:25 -0000	1.12
+++ .cvsignore	7 Jul 2006 05:37:16 -0000	1.13
@@ -11,3 +11,4 @@
 uim-0.4.9.1.tar.gz
 uim-1.0.1.tar.gz
 uim-1.1.0.tar.bz2
+uim-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jun 2006 08:55:25 -0000	1.11
+++ sources	7 Jul 2006 05:37:16 -0000	1.12
@@ -1 +1 @@
-a813cba1f6db0628db3b9abb0c989989  uim-1.1.0.tar.bz2
+40b7a85692e2b1441086a35f7e380105  uim-1.1.1.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uim.spec	19 Jun 2006 09:06:39 -0000	1.20
+++ uim.spec	7 Jul 2006 05:37:16 -0000	1.21
@@ -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 %{_target_platform} || :) || ( [ -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,10 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Fri Jul  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.1-1
+- New upstream release.
+- removed the unnecessary %%post and %%postun.
+
 * Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
 - New upstream release.