rpms/uim/devel uim.spec,1.37,1.38

Akira Tagoh (tagoh) fedora-extras-commits at redhat.com
Tue Apr 3 14:36:57 UTC 2007 

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
* Tue Apr  3 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-3
- Register/Unregister the modules at %%post/%%postun. (#234804)
- Add X-GNOME-PersonalSettings to the desktop file categories.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- uim.spec	26 Mar 2007 04:53:54 -0000	1.37
+++ uim.spec	3 Apr 2007 14:36:23 -0000	1.38
@@ -3,13 +3,13 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel m17n-lib-devel gettext
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel gettext desktop-file-utils
 BuildRequires:	m17n-db-amharic m17n-db-arabic m17n-db-armenian m17n-db-assamese m17n-db-bengali
 BuildRequires:	m17n-db-chinese m17n-db-croatian m17n-db-dhivehi m17n-db-farsi m17n-db-generic
 BuildRequires:	m17n-db-georgian m17n-db-greek m17n-db-gujarati m17n-db-hebrew m17n-db-hindi
@@ -72,31 +72,31 @@
 Group:		System Environment/Libraries
 Requires:	anthy
 Requires:	uim = %{version}-%{release}
-Requires(post):	gtk2
-Requires(postun): gtk2
+Requires(post):	gtk2 /usr/bin/uim-module-manager
+Requires(postun): gtk2 /usr/bin/uim-module-manager
 
 %package	canna
 Summary:	Canna support for Uim
 Group:		System Environment/Libraries
 Requires:	Canna
 Requires:	uim = %{version}-%{release}
-Requires(post):	gtk2
-Requires(postun): gtk2
+Requires(post):	gtk2 /usr/bin/uim-module-manager
+Requires(postun): gtk2 /usr/bin/uim-module-manager
 
 %package	skk
 Summary:	SKK support for Uim
 Group:		System Environment/Libraries
 Requires:	skkdic
 Requires:	uim = %{version}-%{release}
-Requires(post):	gtk2
-Requires(postun): gtk2
+Requires(post):	gtk2 /usr/bin/uim-module-manager
+Requires(postun): gtk2 /usr/bin/uim-module-manager
 
 %package	m17n
 Summary:	m17n-lib support for Uim
 Group:		System Environment/Libraries
 Requires:	uim = %{version}-%{release}
-Requires(post):	gtk2
-Requires(postun): gtk2
+Requires(post):	gtk2 /usr/bin/uim-module-manager
+Requires(postun): gtk2 /usr/bin/uim-module-manager
 
 %description
 Uim is a multilingual input method library. Uim aims to
@@ -176,6 +176,12 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+desktop-file-install --vendor=fedora				\
+	--add-category=X-GNOME-PersonalSettings			\
+	--delete-original					\
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
+	$RPM_BUILD_ROOT%{_datadir}/applications/uim.desktop
+
 # remove unnecessary files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -rf $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*la
@@ -185,12 +191,18 @@
 rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.a
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme
+rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim
+touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm
+ln -sf %{_localstatedir}/lib/uim/installed-modules.scm $RPM_BUILD_ROOT%{_datadir}/uim/
+ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/
+
 %find_lang %{name}
 %find_lang uim-chardict-qt
 
@@ -206,11 +218,13 @@
 %post
 /sbin/ldconfig
 %{inst_xinput}
+/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register tcode trycode tutcode byeoru latin pyload hangul viqr ipa-x-sampa > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ]; then
 	%{uninst_xinput}
+	/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister tcode trycode tutcode byeoru latin pyload hangul viqr ipa-x-sampa > /dev/null 2>&1 || :
 fi
 
 %post gtk2
@@ -229,19 +243,55 @@
 	bonobo-activation-sysconf --remove-directory=%{_libdir}/bonobo/servers
 fi
 
+%post anthy
+/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register anthy > /dev/null 2>&1 || :
+
+%postun anthy
+if [ "$1" = "0" ]; then
+	/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister anthy > /dev/null 2>&1 || :
+fi
+
+%post canna
+/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register canna > /dev/null 2>&1 || :
+
+%postun canna
+if [ "$1" = "0" ]; then
+	/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister canna > /dev/null 2>&1 || :
+fi
+
+%post skk
+/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register skk > /dev/null 2>&1 || :
+
+%postun skk
+if [ "$1" = "0" ]; then
+	/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister skk > /dev/null 2>&1 || :
+fi
+
+%post m17n
+/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register m17nlib > /dev/null 2>&1 || :
+
+%postun m17n
+if [ "$1" = "0" ]; then
+	/usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister m17nlib > /dev/null 2>&1 || :
+fi
 
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
+%dir %{_datadir}/uim
+%dir %{_libdir}/uim
+%dir %{_libdir}/uim/plugin
 %{_bindir}/uim-fep*
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
-%dir %{_datadir}/uim
+%exclude %{_datadir}/uim/anthy*.scm
+%exclude %{_datadir}/uim/canna*.scm
+%exclude %{_datadir}/uim/skk*.scm
+%exclude %{_datadir}/uim/m17nlib.scm
+%{_datadir}/uim/*.scm
 %{_sysconfdir}/X11/xinit/xinput.d
-%dir %{_libdir}/uim
-%dir %{_libdir}/uim/plugin
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
 %{_libexecdir}/uim-helper-server
 %exclude %{_datadir}/uim/pixmaps/anthy.png
@@ -250,6 +300,8 @@
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
+%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/uim/*.scm
+%dir %{_localstatedir}/lib/uim
 
 %files	devel
 %defattr (-, root, root)
@@ -268,7 +320,7 @@
 %{_libdir}/gtk-2.0/2.*/immodules
 %{_libexecdir}/uim-candwin-gtk
 %dir %{_datadir}/uim
-%{_datadir}/applications/uim.desktop
+%{_datadir}/applications/fedora-uim.desktop
 
 %files	gnome
 %defattr (-, root, root)
@@ -324,6 +376,10 @@
 %{_datadir}/uim//pixmaps/m17n*png
 
 %changelog
+* Tue Apr  3 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-3
+- Register/Unregister the modules at %%post/%%postun. (#234804)
+- Add X-GNOME-PersonalSettings to the desktop file categories.
+
 * Mon Mar 26 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-2
 - Own %%{_libdir}/uim/plugin. (#233817)

More information about the scm-commits mailing list