rpms/uim/devel .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 uim.spec, 1.6, 1.7 xinput.d-uim, 1.1, 1.2
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Mon Apr 18 12:51:47 UTC 2005
Author: tagoh
Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28992
Modified Files:
.cvsignore sources uim.spec xinput.d-uim
Log Message:
* Mon Apr 18 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-1
- New upstream release. (#155173)
- fixed missing return statement issue. (#150304)
- Updated upstream URL.
- ensure to build with Canna and anthy.
- enabled Qt immodule.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 24 Feb 2005 05:39:46 -0000 1.5
+++ .cvsignore 18 Apr 2005 12:51:45 -0000 1.6
@@ -4,3 +4,4 @@
uim-0.4.5.tar.gz
uim-0.4.5-autoreconf.patch.bz2
uim-0.4.5.1.tar.gz
+uim-0.4.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Feb 2005 04:51:20 -0000 1.4
+++ sources 18 Apr 2005 12:51:45 -0000 1.5
@@ -1 +1 @@
-10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz
+a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz
Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- uim.spec 1 Apr 2005 16:36:01 -0000 1.6
+++ uim.spec 18 Apr 2005 12:51:45 -0000 1.7
@@ -4,16 +4,16 @@
Summary: A multilingual input method library
Name: uim
-Version: 0.4.5.1
-Release: 2
+Version: 0.4.6
+Release: 1
License: GPL/BSD
Group: System Environment/Libraries
-URL: http://freedesktop.org/Software/uim
-Source0: http://freedesktop.org/Software/UimDownload/%{name}-%{version}.tar.gz
+URL: http://uim.freedesktop.org/
+Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
Source1: xinput.d-uim
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel
-BuildRequires: gnome-panel-devel
+BuildRequires: gtk2-devel gnome-panel-devel qt-devel
+BuildRequires: anthy-devel Canna-devel
Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
@@ -36,6 +36,11 @@
Requires(post): %{_sbindir}/bonobo-activation-sysconf
Requires(postun): %{_sbindir}/bonobo-activation-sysconf
+%package qt
+Summary: Qt support for Uim
+Group: User Interface/Desktops
+Requires: uim = %{version}-%{release}
+
%package anthy
Summary: Anthy support for Uim
Group: System Environment/Libraries
@@ -64,7 +69,7 @@
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
languages. Currently, it can input to applications which
-support Gtk+'s immodule or XIM.
+support Gtk+'s immodule, Qt's immodule and XIM.
This package provides the input method library, the XIM
bridge and most of the input methods.
@@ -77,8 +82,7 @@
%description devel
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
-languages. Currently, it can input to applications which
-support Gtk+'s immodule or XIM.
+languages.
This package contains the header files and the libraries which is
needed for developing Uim applications.
@@ -86,19 +90,23 @@
%description gtk2
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
-languages. Currently, it can input to applications which
-support Gtk+'s immodule or XIM.
+languages.
This package provides the Gtk IM module and helper program.
%description gnome
Uim is a multilingual input method library. Uim aims to
provide secure and useful input methods for all
-languages. Currently, it can input to applications which
-support Gtk+'s immodule or XIM.
+languages.
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
+
+This package provides the Qt IM module and helper programs.
+
%description anthy
This package provides support for Anthy, a Japanese input method.
@@ -121,13 +129,13 @@
%endif
%build
-%configure
+%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
make
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
@@ -140,6 +148,9 @@
# compress large doc
bzip2 ChangeLog
+# remove the unnecessary files
+rm $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*.{a,la}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -208,6 +219,10 @@
%dir %{_datadir}/uim
%{_datadir}/uim/tables
%{_sysconfdir}/X11/xinit/xinput.d
+%dir %{_libdir}/uim
+%{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_datadir}/uim/pixmaps
+%{_datadir}/uim/helperdata
%files devel
%defattr (-, root, root)
@@ -224,36 +239,60 @@
%files gtk2
%defattr (-, root, root)
%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-im-switcher
-%{_bindir}/uim-input-pad-ja
+%{_bindir}/uim-helper-candwin-gtk
+%{_bindir}/uim-helper-toolbar-gtk
+%{_bindir}/uim-helper-toolbar-gtk-systray
%{_bindir}/uim-toolbar-gtk
%{_bindir}/uim-toolbar-gtk-systray
+%{_bindir}/uim-im-switcher-gtk
+%{_bindir}/uim-input-pad-ja
%{_libdir}/gtk-2.0/2.*/immodules
%exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
%dir %{_datadir}/uim
-%{_datadir}/uim/icons
+%{_datadir}/applications/uim.desktop
%files gnome
%defattr (-, root, root)
+%{_libexecdir}/uim-helper-applet
%{_libexecdir}/uim-toolbar-applet
%{_libdir}/bonobo/servers/GNOME_UimApplet.server
+%files 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
+%exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
+
%files anthy
%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-anthy.so
%dir %{_datadir}/uim
-%{_datadir}/uim/anthy.scm
+%{_datadir}/uim/anthy*.scm
%files canna
%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-canna.so
%dir %{_datadir}/uim
-%{_datadir}/uim/canna.scm
+%{_datadir}/uim/canna*.scm
%files skk
%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-skk.so
%dir %{_datadir}/uim
%{_datadir}/uim/skk*.scm
%changelog
+* Mon Apr 18 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-1
+- New upstream release. (#155173)
+ - fixed missing return statement issue. (#150304)
+- Updated upstream URL.
+- ensure to build with Canna and anthy.
+- enabled Qt immodule.
+
* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.4.5.1-2
- Include headers directory in -devel package.
Index: xinput.d-uim
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/xinput.d-uim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.d-uim 24 Feb 2005 05:39:46 -0000 1.1
+++ xinput.d-uim 18 Apr 2005 12:51:45 -0000 1.2
@@ -1,3 +1,4 @@
XIM=uim
XIM_PROGRAM=uim-xim
GTK_IM_MODULE=uim
+QT_IM_MODULE=uim
More information about the fedora-extras-commits
mailing list