rpms/uim/devel uim-init.el, NONE, 1.1 uim.spec, 1.20, 1.21 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1, NONE uim-0.4.6-fix-typo-in-configure.patch, 1.1, NONE uim-0.4.6-multilib.patch, 1.1, NONE
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Thu Dec 15 11:18:16 UTC 2005
Author: tagoh
Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671
Modified Files:
uim.spec
Added Files:
uim-init.el
Removed Files:
uim-0.4.6-dont-require-devel-pkgs.patch
uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-multilib.patch
Log Message:
* Thu Dec 15 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.alpha
- New upstream release.
- added uim-m17n package. (#175600)
- added uim-el package.
- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
--- NEW FILE uim-init.el ---
(require 'uim-leim)
(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")
Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uim.spec 30 Sep 2005 08:40:52 -0000 1.20
+++ uim.spec 15 Dec 2005 11:18:13 -0000 1.21
@@ -2,23 +2,25 @@
%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
-Summary: A multilingual input method library
Name: uim
-Version: 0.4.9.1
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 0.1.alpha%{?dist}
License: GPL/BSD
-Group: System Environment/Libraries
URL: http://uim.freedesktop.org/
-Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
-Source1: xinput.d-uim
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires: anthy-devel Canna-devel
+BuildRequires: anthy-devel Canna-devel m17n-lib-devel
+BuildRequires: emacs
+Source0: http://uim.freedesktop.org/release/%{name}-%{version}-alpha.tar.gz
+Source1: xinput.d-uim
+Source2: uim-init.el
+
+
+Summary: A multilingual input method library
+Group: System Environment/Libraries
Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
-Patch2: uim-0.4.6-dont-require-devel-pkgs.patch
-
%package devel
Summary: Development files for the Uim library
Group: Development/Libraries
@@ -43,6 +45,17 @@
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
+%package el
+Summary: Emacs support for Uim
+Group: System Environment/Libraries
+Requires: %{name}-el-common = %{version}
+Requires: emacs-common
+
+%package el-common
+Summary: Common package for Emacsen support for Uim
+Group: System Environment/Libraries
+Requires: uim = %{version}-%{release}
+
%package anthy
Summary: Anthy support for Uim
Group: System Environment/Libraries
@@ -67,6 +80,13 @@
Requires(post): gtk2
Requires(postun): gtk2
+%package m17n
+Summary: m17n-lib support for Uim
+Group: System Environment/Libraries
+Requires: uim = %{version}-%{release}
+Requires(post): gtk2
+Requires(postun): gtk2
+
%description
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
@@ -110,6 +130,12 @@
This package provides the Qt IM module and helper programs.
+%description el
+This package provides Emacs support.
+
+%description el-common
+This package provides an utility to use Emacsen support for Uim.
+
%description anthy
This package provides support for Anthy, a Japanese input method.
@@ -119,19 +145,18 @@
%description skk
This package provides support for SKK, a Japanese input method.
+%description m17n
+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
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}-alpha
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
%build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
make
%install
@@ -141,10 +166,13 @@
install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+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/
%find_lang %{name}
+%find_lang uim-chardict-qt
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
# compress large doc
@@ -210,21 +238,29 @@
%{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)
%doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
%{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
%{_bindir}/uim-module-manager
%{_bindir}/uim-sh
%{_bindir}/uim-xim
%{_libdir}/lib*.so.*
%dir %{_datadir}/uim
-%{_datadir}/uim/tables
%{_sysconfdir}/X11/xinit/xinput.d
%dir %{_libdir}/uim
%{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
%{_datadir}/uim/pixmaps
%{_datadir}/uim/helperdata
%{_mandir}/man1/uim-xim.1*
@@ -241,8 +277,6 @@
%files gtk2
%defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
%{_bindir}/uim-helper-toolbar-gtk
%{_bindir}/uim-helper-toolbar-gtk-systray
%{_bindir}/uim-pref-gtk
@@ -251,6 +285,7 @@
%{_bindir}/uim-im-switcher-gtk
%{_bindir}/uim-input-pad-ja
%{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
%exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
%dir %{_datadir}/uim
%{_datadir}/applications/uim.desktop
@@ -261,16 +296,27 @@
%{_libexecdir}/uim-toolbar-applet
%{_libdir}/bonobo/servers/GNOME_UimApplet.server
-%files qt
+%files -f uim-chardict-qt.lang qt
%defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
%{_bindir}/uim-chardict-qt
%{_bindir}/uim-im-switcher-qt
%{_bindir}/uim-pref-qt
%{_bindir}/uim-toolbar-qt
%{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
%exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
+%files el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
%files anthy
%defattr (-, root, root)
%{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +335,19 @@
%dir %{_datadir}/uim
%{_datadir}/uim/skk*.scm
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
%changelog
+* Thu Dec 15 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
* Fri Sep 30 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.9.1-1
- New upstream release.
--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---
--- uim-0.4.6-fix-typo-in-configure.patch DELETED ---
--- uim-0.4.6-multilib.patch DELETED ---
More information about the scm-commits
mailing list