rpms/uim/FC-3 uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 uim-0.4.6-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 uim.spec, 1.4, 1.5 xinput.d-uim, 1.1, 1.2
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Tue Jul 12 01:30:35 UTC 2005
Author: tagoh
Update of /cvs/extras/rpms/uim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18907
Modified Files:
.cvsignore sources uim.spec xinput.d-uim
Added Files:
uim-0.4.6-dont-require-devel-pkgs.patch
uim-0.4.6-multilib.patch
Log Message:
* Tue Jul 12 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.7-1.fc3
- New upstream release.
- removed the patches. fixed in upstream.
- uim-0.4.6-multilib.patch
- uim-0.4.6-fix-typo-in-configure.patch
uim-0.4.6-dont-require-devel-pkgs.patch:
--- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch ---
diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c
--- uim-0.4.6.orig/uim/anthy.c 2005-02-05 11:50:05.000000000 +0900
+++ uim-0.4.6/uim/anthy.c 2005-06-13 18:57:15.000000000 +0900
@@ -43,8 +43,8 @@
#define LIBANTHY_SO "libanthy.dylib"
#define LIBANTHYDIC_SO "libanthydic.dylib"
#else
- #define LIBANTHY_SO "libanthy.so"
- #define LIBANTHYDIC_SO "libanthydic.so"
+ #define LIBANTHY_SO "libanthy.so.0"
+ #define LIBANTHYDIC_SO "libanthydic.so.0"
#endif /*__APPLE__*/
diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c
--- uim-0.4.6.orig/uim/canna.c 2005-02-05 11:50:05.000000000 +0900
+++ uim-0.4.6/uim/canna.c 2005-06-13 18:56:33.000000000 +0900
@@ -48,7 +48,7 @@
/* #define UIM_CANNA_DEBUG */
#define MAX_CONTEXT 256
-#define LIBCANNA_SO "libcanna.so"
+#define LIBCANNA_SO "libcanna.so.1"
#define BUFSIZE 1024
uim-0.4.6-multilib.patch:
--- NEW FILE uim-0.4.6-multilib.patch ---
diff -ur uim-0.4.6.orig/configure.ac uim-0.4.6/configure.ac
--- uim-0.4.6.orig/configure.ac 2005-05-11 11:46:09.000000000 -0400
+++ uim-0.4.6/configure.ac 2005-05-11 11:46:26.000000000 -0400
@@ -613,7 +613,7 @@
fi
LDFLAGS=$_SAVE_LDFLAGS
- QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11"
+ QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11"
_SAVE_CXXFLAGS=$CXXFLAGS
_SAVE_LIBS=$LIBS
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/.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 12 Jul 2005 01:30:32 -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.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/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 12 Jul 2005 01:30:32 -0000 1.5
@@ -1 +1 @@
-10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz
+1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz
Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uim.spec 24 Feb 2005 05:39:46 -0000 1.4
+++ uim.spec 12 Jul 2005 01:30:32 -0000 1.5
@@ -4,17 +4,20 @@
Summary: A multilingual input method library
Name: uim
-Version: 0.4.5.1
-Release: 1
+Version: 0.4.7
+Release: 1%{?dist}
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
-Requires(post,postun): %{_sbindir}/alternatives
+BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel
+BuildRequires: anthy-devel Canna-devel
+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
@@ -25,40 +28,50 @@
Summary: GTK+2 support for Uim
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post): gtk2
+Requires(postun): gtk2
%package gnome
Summary: GNOME Applet for Uim
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
-Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf
+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
Requires: anthy
Requires: uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post): gtk2
+Requires(postun): gtk2
%package canna
Summary: Canna support for Uim
Group: System Environment/Libraries
Requires: Canna Canna-devel
Requires: uim = %{version}-%{release}
-Requires(post,postun): gtk2
+Requires(post): gtk2
+Requires(postun): gtk2
%package skk
Summary: SKK support for Uim
Group: System Environment/Libraries
Requires: skkdic
Requires: uim = %{version}-%{release}
-Requires(post,postun): gtk2
+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
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.
@@ -71,8 +84,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.
@@ -80,19 +92,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.
@@ -102,38 +118,40 @@
%description skk
This package provides support for SKK, a Japanese input method.
-%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
+%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
-%ifarch x86_64
# 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
-%endif
%build
-%configure
+%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
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
%find_lang %{name}
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
# compress large doc
bzip2 ChangeLog
+# remove the unnecessary files
+rm $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*.{a,la}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -197,63 +215,121 @@
%lang(ja) %doc README.ja
%{_bindir}/uim-fep*
%{_bindir}/uim-helper-server
+%{_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
+%{_datadir}/uim/pixmaps
+%{_datadir}/uim/helperdata
+%{_mandir}/man1/uim-xim.1*
%files devel
%defattr (-, root, root)
%dir %{_datadir}/uim
-%{_bindir}/uim-sh
-%{_includedir}/uim/*
+%{_includedir}/uim/
%{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
%{_libdir}/lib*.a
%{_libdir}/lib*.la
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
-%{_datadir}/uim/uim-sh.scm
%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-pref-gtk
%{_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
+* Tue Jul 12 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.7-1.fc3
+- New upstream release.
+- removed the patches. fixed in upstream.
+ - uim-0.4.6-multilib.patch
+ - uim-0.4.6-fix-typo-in-configure.patch
+
+* Wed Jun 29 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-5
+- built with --without-scim explicitly. it doesn't work actually.
+
+* Mon Jun 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-4
+- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building.
+- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen
+ the shared libraries without -devel packages.
+
+* Mon May 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-3
+- uim-0.4.6-multilib.patch: applied to fix a build issue for
+ libquiminputcontextplugin.so. (John Thacker, #156880)
+
+* Fri May 6 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-2
+- added BuildRequires: ncurses-devel. (#156880)
+
+* 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.
+- added QT_IM_MODULE=uim to xinput.d-uim
+
+* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.4.5.1-2
+- Include headers directory in -devel package.
+
+* Fri Mar 4 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+- Add ldconfig scriptlet dependencies.
+
* Thu Feb 24 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.5.1-1
- New upstream release.
- security fix.
- support xinput script.
-* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info 0.4.5-2
+* Sun Feb 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> 0.4.5-2
- Added autoreconf-patch; fixes build on x86_64
* Wed Jan 12 2005 Akira TAGOH <tagoh at redhat.com> 0.4.5-1
Index: xinput.d-uim
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/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 12 Jul 2005 01:30:32 -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