rpms/uim/devel .cvsignore, 1.20, 1.21 sources, 1.19, 1.20 uim.spec, 1.57, 1.58
Akira TAGOH (tagoh)
fedora-extras-commits at redhat.com
Thu May 22 04:18:56 UTC 2008
Author: tagoh
Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785
Modified Files:
.cvsignore sources uim.spec
Log Message:
* Thu May 22 2008 Akira TAGOH <tagoh at redhat.com> - 1.5.0-1
- New upstream release.
- Add xemacs-uim sub-package.
- Qt4 immodule is available in uim-qt now. (#440172)
- Build with --with-anthy-utf8 and --with-eb.
- Rename uim-el and uim-el-common to emacs-uim and emacs-common-uim.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 10 Mar 2008 09:48:01 -0000 1.20
+++ .cvsignore 22 May 2008 04:18:09 -0000 1.21
@@ -20,3 +20,4 @@
uim-1.4.0.tar.bz2
uim-1.4.1.tar.bz2
uim-1.4.2.tar.bz2
+uim-1.5.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 10 Mar 2008 09:48:01 -0000 1.19
+++ sources 22 May 2008 04:18:09 -0000 1.20
@@ -1 +1 @@
-f5ac910cfa668343c73ca93e314d80ba uim-1.4.2.tar.bz2
+04180f36fad2c473aa72948662039cf4 uim-1.5.0.tar.bz2
Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- uim.spec 23 Apr 2008 05:19:17 -0000 1.57
+++ uim.spec 22 May 2008 04:18:09 -0000 1.58
@@ -2,8 +2,8 @@
%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
Name: uim
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
# uim itself is licensed under BSD
# scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
# and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -12,8 +12,8 @@
URL: http://code.google.com/p/uim/
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 qt3-devel ncurses-devel
-BuildRequires: anthy-devel Canna-devel m17n-lib-devel gettext desktop-file-utils
+BuildRequires: gtk2-devel gnome-panel-devel qt3-devel qt-devel ncurses-devel
+BuildRequires: anthy-devel Canna-devel m17n-lib-devel eb-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-gregorian m17n-db-greek m17n-db-gujarati m17n-db-hebrew m17n-db-hindi
@@ -27,6 +27,7 @@
Source1: xinput.d-uim
Source2: uim-init.el
Patch0: uim-1.4.2-emacs23.patch
+Patch1: uim-qt-destdir.patch
Summary: A multilingual input method library
@@ -57,6 +58,11 @@
Requires(postun): %{_sbindir}/bonobo-activation-sysconf
Requires: uim-gtk2
+%package qt
+Summary: Qt4 support for Uim
+Group: User Interface/Desktops
+Requires: uim-qt-common = %{version}-%{release}
+
%package qt3
Summary: Qt3 support for Uim
Group: User Interface/Desktops
@@ -69,16 +75,26 @@
Requires: uim = %{version}-%{release}
Obsoletes: uim-qt < 1.4.2-2
-%package el
+%package -n emacs-uim
Summary: Emacs support for Uim
Group: System Environment/Libraries
-Requires: %{name}-el-common = %{version}
-Requires: emacs-common
+Requires: emacs-common-uim = %{version}-%{release}
+Requires: emacs(bin)
+Conflicts: uim-el < 1.5.0-1
+Provides: uim-el = %{version}-%{release}
-%package el-common
+%package -n emacs-common-uim
Summary: Common package for Emacsen support for Uim
Group: System Environment/Libraries
Requires: uim = %{version}-%{release}
+Conflicts: uim-el-common < 1.5.0-1
+Provides: uim-el-common = %{version}-%{release}
+
+%package -n xemacs-uim
+Summary: XEmacs support for Uim
+Group: System Environment/Libraries
+Requires: emacs-common-uim = %{version}-%{release}
+Requires: xemacs(bin) xemacs-packages-extra
%package anthy
Summary: Anthy support for Uim
@@ -111,6 +127,7 @@
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
provide secure and useful input methods for all
@@ -147,6 +164,13 @@
This package provides the GNOME panel applet.
+%description qt
+Uim is a multilingual input method library. Uim aims to
+provide secure and useful input methods for all
+languages.
+
+This package provides the Qt4 IM module and helper programs.
+
%description qt3
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
@@ -161,12 +185,15 @@
This package contains the helper applications for Qt support.
-%description el
+%description -n emacs-uim
This package provides Emacs support.
-%description el-common
+%description -n emacs-common-uim
This package provides an utility to use Emacsen support for Uim.
+%description -n xemacs-uim
+This package provides XEmacs support.
+
%description anthy
This package provides support for Anthy, a Japanese input method.
@@ -184,18 +211,33 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .emacs23
+%patch1 -p1 -b .qt-destdir
+aclocal -Im4
+automake --add-missing
+autoconf
%build
# assumes that this is built against qt-3.3.
export QTDIR=%{_libdir}/qt-3.3
-%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
+%configure --with-x --with-xft \
+ --with-canna \
+ --with-anthy --with-anthy-utf8 \
+ --with-m17nlib \
+ --with-eb --with-eb-conf=%{_libdir}/eb.conf \
+ --without-scim \
+ --with-gtk2 --with-gnome2 --enable-gnome-applet \
+ --with-qt --with-qt-immodule --with-qt4-immodule \
+ --with-lispdir=%{_datadir}/emacs/site-lisp \
+ --enable-pref
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+# For XEmacs
+(cd emacs; make install DESTDIR=$RPM_BUILD_ROOT UIMEL_LISP_DIR=%{_datadir}/xemacs/site-packages/lisp/uim-el)
# remove .desktop file (#240706)
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/uim.desktop
@@ -206,6 +248,7 @@
rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gcroots.pc
rm -rf $RPM_BUILD_ROOT%{_includedir}/gcroots.h
rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme
rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme
@@ -215,6 +258,8 @@
install -m 0644 -p %{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 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
+install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm
@@ -224,8 +269,12 @@
%find_lang %{name}
%find_lang uim-chardict-qt
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
+find $RPM_BUILD_ROOT -name "*.png" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn)" > png.list
+cat png.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
+find $RPM_BUILD_ROOT -name "*.svg" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn)" > svg.list
+cat svg.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
# compress large doc
bzip2 ChangeLog
@@ -293,40 +342,63 @@
/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 %{_libdir}/uim
%dir %{_libdir}/uim/plugin
+%dir %{_datadir}/uim
+%dir %{_localstatedir}/lib/uim
%{_bindir}/uim-fep*
%{_bindir}/uim-module-manager
%{_bindir}/uim-sh
%{_bindir}/uim-xim
%{_libdir}/lib*.so.*
+%{_datadir}/uim/helperdata
+%ghost %verify(not md5 size mtime) %{_datadir}/uim/installed-modules.scm
+%ghost %verify(not md5 size mtime) %{_datadir}/uim/loader.scm
%exclude %{_datadir}/uim/anthy*.scm
%exclude %{_datadir}/uim/canna*.scm
-%exclude %{_datadir}/uim/skk*.scm
%exclude %{_datadir}/uim/m17nlib.scm
+%exclude %{_datadir}/uim/mana*.scm
+%exclude %{_datadir}/uim/prime*.scm
+%exclude %{_datadir}/uim/scim.scm
+%exclude %{_datadir}/uim/sj3*.scm
+%exclude %{_datadir}/uim/skk*.scm
+%exclude %{_datadir}/uim/wnn*.scm
## pixmaps are licensed under BSD or LGPLv2
-%exclude %{_datadir}/uim/pixmaps/anthy.png
+%exclude %{_datadir}/uim/pixmaps/anthy*.png
%exclude %{_datadir}/uim/pixmaps/canna.png
%exclude %{_datadir}/uim/pixmaps/m17n*png
-%{_datadir}/uim
+%exclude %{_datadir}/uim/pixmaps/mana.png
+%exclude %{_datadir}/uim/pixmaps/mana.svg
+%exclude %{_datadir}/uim/pixmaps/prime*.png
+%exclude %{_datadir}/uim/pixmaps/prime*.svg
+%exclude %{_datadir}/uim/pixmaps/scim.png
+%exclude %{_datadir}/uim/pixmaps/scim.svg
+%exclude %{_datadir}/uim/pixmaps/sj3.png
+%exclude %{_datadir}/uim/pixmaps/sj3.svg
+%exclude %{_datadir}/uim/pixmaps/skk.png
+%exclude %{_datadir}/uim/pixmaps/skk.svg
+%exclude %{_datadir}/uim/pixmaps/wnn.png
+%exclude %{_datadir}/uim/pixmaps/wnn.svg
%{_sysconfdir}/X11/xinit/xinput.d
%{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libdir}/uim/plugin/libuim-look.so
%{_libexecdir}/uim-helper-server
%{_mandir}/man1/uim-xim.1*
-%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/uim/*.scm
-%dir %{_localstatedir}/lib/uim
%files devel
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_includedir}/uim/
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%files gtk2
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
# BSD
%{_bindir}/uim-toolbar-gtk
# BSD and LGPLv2+
@@ -340,15 +412,23 @@
%files gnome
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_libexecdir}/uim-toolbar-applet
%{_libdir}/bonobo/servers/GNOME_UimApplet.server
+%files qt
+%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
+%{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so
+
%files qt3
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_libdir}/qt-3.*/plugins/inputmethods
%files -f uim-chardict-qt.lang qt-common
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
# BSD and LGPLv2+
%{_bindir}/uim-chardict-qt
# BSD
@@ -359,28 +439,39 @@
%{_bindir}/uim-toolbar-qt
%{_libexecdir}/uim-candwin-qt
-%files el
+%files -n emacs-uim
%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
+%files -n xemacs-uim
+%defattr (-, root, root, -)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/xemacs/site-packages/lisp/uim-el
+%{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el
+
+%files -n emacs-common-uim
%defattr (-, root, root, -)
+%doc emacs/COPYING emacs/README
%{_bindir}/uim-el-agent
%{_bindir}/uim-el-helper-agent
%files anthy
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_libdir}/uim/plugin/libuim-anthy.so
+%{_libdir}/uim/plugin/libuim-anthy-utf8.so
%{_datadir}/uim/anthy*.scm
# BSD or LGPLv2
-%{_datadir}/uim/pixmaps/anthy.png
+%{_datadir}/uim/pixmaps/anthy*.png
%dir %{_datadir}/uim
%files canna
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_libdir}/uim/plugin/libuim-canna.so
%{_datadir}/uim/canna*.scm
# BSD or LGPLv2
@@ -389,12 +480,17 @@
%files skk
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
%{_libdir}/uim/plugin/libuim-skk.so
%{_datadir}/uim/skk*.scm
+%{_datadir}/uim/pixmaps/skk.png
+%{_datadir}/uim/pixmaps/skk.svg
%dir %{_datadir}/uim
%files m17n
%defattr (-, root, root, -)
+%doc AUTHORS COPYING ChangeLog* NEWS README
+%{_bindir}/uim-m17nlib-relink-icons
%{_libdir}/uim/plugin/libuim-m17nlib.so
%{_datadir}/uim/m17nlib.scm
# BSD or LGPLv2
@@ -402,6 +498,13 @@
%dir %{_datadir}/uim
%changelog
+* Thu May 22 2008 Akira TAGOH <tagoh at redhat.com> - 1.5.0-1
+- New upstream release.
+- Add xemacs-uim sub-package.
+- Qt4 immodule is available in uim-qt now. (#440172)
+- Build with --with-anthy-utf8 and --with-eb.
+- Rename uim-el and uim-el-common to emacs-uim and emacs-common-uim.
+
* Tue Apr 22 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-3
- uim-1.4.2-emacs23.patch: Apply to get uim.el working on Emacs 23. (#443572)
More information about the fedora-extras-commits
mailing list