From 26f033cf85a5f6fea1d963f53625f6d165f2d208 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 13 Nov 2012 21:10:34 +0100 Subject: [PATCH] - updated to 1.8.3 - removed obsolete patches --- uim-enable-libgcroots.patch | 11 ------- uim-link.patch | 60 ------------------------------------- uim-qt-po.patch | 37 ----------------------- uim.spec | 43 +++++++++++++++----------- 4 files changed, 25 insertions(+), 126 deletions(-) delete mode 100644 uim-enable-libgcroots.patch delete mode 100644 uim-link.patch delete mode 100644 uim-qt-po.patch diff --git a/uim-enable-libgcroots.patch b/uim-enable-libgcroots.patch deleted file mode 100644 index 38e82f9..0000000 --- a/uim-enable-libgcroots.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- uim-1.6.0.orig/configure.ac 2010-08-12 14:15:54.000000000 +0900 -+++ uim-1.6.0/configure.ac 2010-08-12 14:25:02.000000000 +0900 -@@ -1800,7 +1800,7 @@ AC_SUBST(abs_top_builddir) - # - # --with-master-pkg=uim instructs that pkgdatadir for Scheme libraries. - # See also sigscheme/lib/Makefile.am --ac_configure_args="$ac_configure_args --with-master-pkg=uim --enable-conf=uim --disable-libsscm --disable-shell" -+ac_configure_args="$ac_configure_args --with-master-pkg=uim --enable-conf=uim --disable-libsscm --disable-shell --with-libgcroots=installed" - AC_CONFIG_SUBDIRS([sigscheme]) - - AC_CONFIG_FILES([Makefile diff --git a/uim-link.patch b/uim-link.patch deleted file mode 100644 index 4338933..0000000 --- a/uim-link.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- uim-1.7.0/configure.ac~ 2011-05-12 15:18:18.000000000 +0200 -+++ uim-1.7.0/configure.ac 2011-07-15 22:52:35.101500283 +0200 -@@ -714,13 +714,13 @@ AC_ARG_WITH(gtk2, - use_gtk2="no" - ;; - yes|*) -- PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no") -- PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no") -+ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0 x11, use_gtk2="yes",use_gtk2="no") -+ PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0 x11, use_gtk2_4="yes",use_gtk2_4="no") - ;; - esac - ], -- [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no") -- PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no") ]) -+ [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0 x11, use_gtk2="yes",use_gtk2="no") -+ PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0 x11, use_gtk2_4="yes",use_gtk2_4="no") ]) - - AC_ARG_ENABLE(gnome-applet, - AC_HELP_STRING([--disable-gnome-applet], -@@ -1046,8 +1046,8 @@ - yes|*) - use_uim_fep="yes" - AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", -- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", -- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) -+ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses -ltinfo $FEP_LIBADD", -+ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no","-ltinfo")]) - AC_CHECK_FUNCS(forkpty) - if test $ac_cv_func_forkpty = no; then - AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) -@@ -1058,8 +1058,8 @@ - ], - [ use_uim_fep="yes" - AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", -- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", -- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) -+ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses -ltinfo $FEP_LIBADD", -+ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no","-ltinfo")]) - AC_CHECK_FUNCS(forkpty) - if test $ac_cv_func_forkpty = no; then - AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) -@@ -1174,14 +1174,13 @@ - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" -- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" - AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", -- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", -+ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses -ltinfo", - AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") -- use_libedit="no")]) -+ use_libedit="no","-ltinfo")]) - if test "x$use_libedit" != "xno"; then - AC_CHECK_LIB(edit, el_init, -- [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib" -+ [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS" - AC_SUBST(LIBEDIT_LIBS)], - [AC_MSG_WARN("libedit not found. Disabled...") - use_libedit="no"]) diff --git a/uim-qt-po.patch b/uim-qt-po.patch deleted file mode 100644 index 752204c..0000000 --- a/uim-qt-po.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- uim-1.7.0/qt/chardict/po/Makefile.in.in~ 2011-05-17 06:16:20.000000000 +0200 -+++ uim-1.7.0/qt/chardict/po/Makefile.in.in 2011-07-18 01:07:28.530206913 +0200 -@@ -17,7 +17,7 @@ - # We have the following line for use by intltoolize: - # INTLTOOL_MAKEFILE - --GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GETTEXT_PACKAGE = uim-chardict-qt - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ - ---- uim-1.7.0/qt4/chardict/po/Makefile.in.in~ 2011-05-17 06:16:20.000000000 +0200 -+++ uim-1.7.0/qt4/chardict/po/Makefile.in.in 2011-07-18 01:08:14.373761366 +0200 -@@ -17,7 +17,7 @@ - # We have the following line for use by intltoolize: - # INTLTOOL_MAKEFILE - --GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GETTEXT_PACKAGE = uim-chardict-qt4 - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ - ---- uim-1.7.0/qt4/chardict/qt4.cpp~ 2011-03-27 03:48:08.000000000 +0200 -+++ uim-1.7.0/qt4/chardict/qt4.cpp 2011-07-18 01:09:06.752063391 +0200 -@@ -66,9 +66,9 @@ - { - - setlocale(LC_ALL, ""); -- bindtextdomain(PACKAGE "-chardict-qt", LOCALEDIR); -- textdomain(PACKAGE "-chardict-qt"); -- bind_textdomain_codeset(PACKAGE "-chardict-qt", "UTF-8"); -+ bindtextdomain(PACKAGE "-chardict-qt4", LOCALEDIR); -+ textdomain(PACKAGE "-chardict-qt4"); -+ bind_textdomain_codeset(PACKAGE "-chardict-qt4", "UTF-8"); - - QApplication a( argc, argv ); - diff --git a/uim.spec b/uim.spec index e96d9d1..d754919 100644 --- a/uim.spec +++ b/uim.spec @@ -1,18 +1,15 @@ Summary: Multilingual input method library Summary(pl.UTF-8): Biblioteka obsługująca wejście w wielu językach Name: uim -Version: 1.7.1 -Release: 2 +Version: 1.8.3 +Release: 1 License: GPL or BSD Group: Libraries Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 80027d3706f28d1dff9a159139b87adf +# Source0-md5: 918ce698765ea25b402a110b86b4d23c Source1: %{name}.xinputd Source2: %{name}-init.el -Patch0: %{name}-link.patch -Patch1: %{name}-emacs-utf8.patch -Patch2: %{name}-enable-libgcroots.patch -Patch3: %{name}-qt-po.patch +Patch0: %{name}-emacs-utf8.patch URL: http://uim.freedesktop.org/ BuildRequires: Canna-devel BuildRequires: Qt3Support-devel @@ -250,9 +247,6 @@ languages using the input table map from m17n-db. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 cp -a fep/README fep/README.fep cp -a fep/README.ja fep/README.fep.ja @@ -260,10 +254,8 @@ cp -a fep/README.key fep/README.fep.key cp -a xim/README xim/README.xim %build -%{__aclocal} -I m4 -%{__autoconf} -%{__automake} %configure \ + --with-libgcroots=installed \ --enable-openssl \ --disable-gnome2-applet \ --enable-gnome3-applet \ @@ -308,6 +300,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d \ $RPM_BUILD_ROOT%{_localstatedir}/lib/uim %{__make} -j1 install \ + QT_PLUGINSDIR=%{_libdir}/qt/plugins-mt \ DESTDIR=$RPM_BUILD_ROOT # For XEmacs @@ -315,7 +308,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d \ DESTDIR=$RPM_BUILD_ROOT \ UIMEL_LISP_DIR=%{_datadir}/xemacs-packages/lisp/uim-el -%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/gtk*/*/immodules,/uim/*}/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}{,/gtk*/*/immodules,/uim/*,/qt/plugins-mt/*}/*.la %{__sed} -e 's|@@LIB@@|%{_lib}|g' %{SOURCE1} >$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/ @@ -346,8 +339,6 @@ $RPM_BUILD_ROOT%{_bindir}/uim-module-manager \ --unregister anthy anthy-utf8 canna mana skk m17nlib %find_lang %{name} -%find_lang %{name}-chardict-qt -%find_lang %{name}-chardict-qt4 %clean rm -rf $RPM_BUILD_ROOT @@ -464,6 +455,19 @@ fi %attr(755,root,root) %{_libdir}/uim/plugin/libuim-sqlite3.so %dir %{_datadir}/uim %{_datadir}/%{name}/* +%exclude %{_datadir}/uim/anthy*.scm +%exclude %{_datadir}/uim/canna*.scm +%exclude %{_datadir}/uim/mana*.scm +%exclude %{_datadir}/uim/prime*.scm +%exclude %{_datadir}/uim/skk*.scm +%exclude %{_datadir}/uim/m17nlib.scm +%exclude %{_datadir}/uim/pixmaps/anthy*.png +%exclude %{_datadir}/uim/pixmaps/canna.png +%exclude %{_datadir}/uim/pixmaps/mana.png +%exclude %{_datadir}/uim/pixmaps/prime.png +%exclude %{_datadir}/uim/pixmaps/skk*.png +%exclude %{_datadir}/uim/pixmaps/skk*.svg +%exclude %{_datadir}/uim/pixmaps/m17n*png %{_desktopdir}/uim.desktop %{_mandir}/man1/*.1* %dir %{_localstatedir}/lib/uim @@ -486,6 +490,7 @@ fi %attr(755,root,root) %{_libdir}/gtk-2.0/*/immodules/*.so %attr(755,root,root) %{_libdir}/uim-candwin-gtk %attr(755,root,root) %{_libdir}/uim-candwin-tbl-gtk +%attr(755,root,root) %{_libdir}/uim-candwin-horizontal-gtk %files gtk3 %defattr(644,root,root,755) @@ -498,6 +503,7 @@ fi %attr(755,root,root) %{_libdir}/gtk-3.0/*/immodules/*.so %attr(755,root,root) %{_libdir}/uim-candwin-gtk3 %attr(755,root,root) %{_libdir}/uim-candwin-tbl-gtk3 +%attr(755,root,root) %{_libdir}/uim-candwin-horizontal-gtk3 %files gnome %defattr(644,root,root,755) @@ -505,7 +511,7 @@ fi %{_datadir}/dbus-1/services/org.gnome.panel.applet.UimAppletFactory.service %{_datadir}/gnome-panel/4.0/applets/UimApplet.panel-applet -%files qt -f %{name}-chardict-qt4.lang +%files qt %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/uim-chardict-qt4 %attr(755,root,root) %{_bindir}/uim-im-switcher-qt4 @@ -514,13 +520,14 @@ fi %attr(755,root,root) %{_libdir}/qt4/plugins/inputmethods/*.so %attr(755,root,root) %{_libdir}/uim-candwin-qt4 -%files qt3 -f %{name}-chardict-qt.lang +%files qt3 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/uim-chardict-qt %attr(755,root,root) %{_bindir}/uim-im-switcher-qt %attr(755,root,root) %{_bindir}/uim-pref-qt %attr(755,root,root) %{_bindir}/uim-toolbar-qt %attr(755,root,root) %{_libdir}/uim-candwin-qt +%attr(755,root,root) %{_libdir}/qt/plugins-mt/inputmethods/*.so %files kde %defattr(644,root,root,755) -- 2.44.0