From d98fcb29bf10adbf03703ac11f128f2deffbf9fc Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 12 Aug 2010 17:18:22 +0900 Subject: [PATCH] * Thu Aug 12 2010 Akira TAGOH - 1.6.0-1 - new upstream release. --- sources | 2 +- uim-enable-libgcroots.patch | 11 ++++ uim.spec | 124 +++++++++++++++++++++++++----------- 3 files changed, 100 insertions(+), 37 deletions(-) create mode 100644 uim-enable-libgcroots.patch diff --git a/sources b/sources index 5afb4cc..87f9a03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b84a43fb92d7ceb4bd801a76120c2a71 uim-1.5.7.tar.bz2 +cb3b9b2adaff3db9dec43658f30e9f89 uim-1.6.0.tar.bz2 diff --git a/uim-enable-libgcroots.patch b/uim-enable-libgcroots.patch new file mode 100644 index 0000000..38e82f9 --- /dev/null +++ b/uim-enable-libgcroots.patch @@ -0,0 +1,11 @@ +--- 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.spec b/uim.spec index 2d7a9e6..244caaa 100644 --- a/uim.spec +++ b/uim.spec @@ -2,8 +2,8 @@ %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf Name: uim -Version: 1.5.7 -Release: 3%{?dist} +Version: 1.6.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,9 +12,13 @@ License: BSD and LGPLv2+ and (BSD or LGPLv2) 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 qt-devel ncurses-devel libgnomeui-devel -BuildRequires: anthy-devel Canna-devel m17n-lib-devel eb-devel gettext desktop-file-utils -BuildRequires: m17n-db-devel +BuildRequires: libgcroots-devel +BuildRequires: gtk2-devel gnome-panel-devel ncurses-devel libgnomeui-devel +BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils +BuildRequires: qt3-devel kdelibs3-devel +BuildRequires: qt-devel cmake kdelibs-devel +BuildRequires: libedit-devel openssl-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: m17n-lib-devel m17n-db-devel 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 @@ -29,6 +33,7 @@ Source1: xinput.d-uim Source2: uim-init.el Patch0: uim-fix-implicit-dsolinking.patch Patch1: uim-emacs-utf8.patch +Patch2: uim-enable-libgcroots.patch Summary: A multilingual input method library @@ -61,19 +66,24 @@ 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 -Requires: uim-qt-common = %{version}-%{release} -Obsoletes: uim-qt < 1.4.2-2 +Obsoletes: uim-qt < 1.4.2-2 %{name}-qt-common < 1.6.0 +Provides: %{name}-qt-common = %{version}-%{release} -%package qt-common -Summary: Qt support for Uim +%package kde +Summary: KDE Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} -Obsoletes: uim-qt < 1.4.2-2 +Requires: uim-qt + +%package kde3 +Summary: KDE3 Applet for Uim +Group: User Interface/Desktops +Requires: uim = %{version}-%{release} +Requires: uim-qt3 %package -n emacs-uim Summary: Emacs support for Uim @@ -180,12 +190,19 @@ languages. This package provides the Qt3 IM module and helper programs. -%description qt-common +%description kde Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. -This package contains the helper applications for Qt support. +This package provides the KDE applet. + +%description kde3 +Uim is a multilingual input method library. Uim aims to +provide secure and useful input methods for all +languages. + +This package provides the KDE3 applet. %description -n emacs-uim This package provides Emacs support. @@ -212,8 +229,9 @@ many languages using the input table map from m17n-db. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .dso -%patch1 -p1 -b .emacs +%patch0 -p1 -b .0-dso +%patch1 -p1 -b .1-emacs +%patch2 -p1 -b .2-libgcroots autoconf @@ -227,7 +245,13 @@ export QTDIR=%{_libdir}/qt-3.3 --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-qt --with-qt-immodule \ + --with-qt4 --with-qt4-immodule \ + --enable-kde-applet --enable-kde4-applet \ + --with-curl \ + --with-expat \ + --enable-openssl --with-ssl-engine \ + --with-sqlite3 \ --with-lispdir=%{_datadir}/emacs/site-lisp \ --enable-pref @@ -250,14 +274,14 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la rm -rf $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*la 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%{_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 rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm -rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/kde3/uim_panelapplet.* -rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop +rm -rf $RPM_BUILD_ROOT%{_libdir}/kde3/*.la +#rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf @@ -280,12 +304,13 @@ ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/ touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc %find_lang %{name} %find_lang %{name}-chardict-qt +%find_lang %{name}-chardict-qt4 -find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > 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 +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 +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 @@ -369,11 +394,13 @@ fi %dir %{_datadir}/uim/pixmaps %dir %{_localstatedir}/lib/uim %{_bindir}/uim-fep* +%{_bindir}/uim-help %{_bindir}/uim-module-manager %{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* %{_datadir}/uim/helperdata +%{_datadir}/uim/tables/*.table %verify(not md5 size mtime) %{_datadir}/uim/installed-modules.scm %verify(not md5 size mtime) %{_datadir}/uim/loader.scm %ghost %{_localstatedir}/lib/uim/*.scm @@ -404,8 +431,18 @@ fi %exclude %{_datadir}/uim/pixmaps/wnn.svg %{_sysconfdir}/X11/xinit/xinput.d %ghost %{_sysconfdir}/X11/xinit/xinputrc +%{_libdir}/uim/plugin/libuim-curl.so %{_libdir}/uim/plugin/libuim-custom-enabler.so +%{_libdir}/uim/plugin/libuim-eb.so +%{_libdir}/uim/plugin/libuim-editline.so +%{_libdir}/uim/plugin/libuim-expat.so +%{_libdir}/uim/plugin/libuim-fileio.so +%{_libdir}/uim/plugin/libuim-lolevel.so %{_libdir}/uim/plugin/libuim-look.so +%{_libdir}/uim/plugin/libuim-openssl.so +%{_libdir}/uim/plugin/libuim-process.so +%{_libdir}/uim/plugin/libuim-socket.so +%{_libdir}/uim/plugin/libuim-sqlite3.so %{_libexecdir}/uim-helper-server %{_mandir}/man1/uim-xim.1* @@ -429,6 +466,7 @@ fi %{_bindir}/uim-input-pad-ja %{_libdir}/gtk-2.0/2.*/immodules %{_libexecdir}/uim-candwin-gtk +%{_libexecdir}/uim-candwin-tbl-gtk %files gnome %defattr (-, root, root, -) @@ -436,18 +474,17 @@ fi %{_libexecdir}/uim-toolbar-applet %{_libdir}/bonobo/servers/GNOME_UimApplet.server -%files qt +%files qt -f %{name}-chardict-qt4.lang %defattr (-, root, root, -) -%doc AUTHORS COPYING ChangeLog* NEWS qt4/immodule/README.en -%lang(ja) %doc qt4/immodule/README.ja +%doc AUTHORS COPYING ChangeLog* NEWS +%{_bindir}/uim-chardict-qt4 +%{_bindir}/uim-im-switcher-qt4 +%{_bindir}/uim-pref-qt4 +%{_bindir}/uim-toolbar-qt4 +%{_libexecdir}/uim-candwin-qt4 %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so -%files qt3 -%defattr (-, root, root, -) -%doc AUTHORS COPYING ChangeLog* NEWS README -%{_libdir}/qt-3.*/plugins/inputmethods - -%files qt-common -f %{name}-chardict-qt.lang +%files qt3 -f %{name}-chardict-qt.lang %defattr (-, root, root, -) %doc AUTHORS COPYING ChangeLog* NEWS README # BSD and LGPLv2+ @@ -459,6 +496,19 @@ fi # BSD %{_bindir}/uim-toolbar-qt %{_libexecdir}/uim-candwin-qt +%{_libdir}/qt-3.*/plugins/inputmethods + +%files kde +%defattr (-, root, root, -) +%doc AUTHORS COPYING ChangeLog* NEWS README +%{_libdir}/kde4/plasma_applet_uim.so +%{_datadir}/kde4/services/plasma-applet-uim.desktop + +%files kde3 +%defattr (-, root, root, -) +%doc AUTHORS COPYING ChangeLog* NEWS README +%{_libdir}/kde3/uim_panelapplet.so +%{_datadir}/apps/kicker/applets/uimapplet.desktop %files -n emacs-uim %defattr (-, root, root, -) @@ -493,7 +543,6 @@ fi %files canna %defattr (-, root, root, -) %doc AUTHORS COPYING ChangeLog* NEWS README -%{_libdir}/uim/plugin/libuim-canna.so %{_datadir}/uim/canna*.scm # BSD or LGPLv2 %{_datadir}/uim/pixmaps/canna.png @@ -504,8 +553,8 @@ fi %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 +%{_datadir}/uim/pixmaps/skk*.png +%{_datadir}/uim/pixmaps/skk*.svg %dir %{_datadir}/uim %files m17n @@ -519,6 +568,9 @@ fi %dir %{_datadir}/uim %changelog +* Thu Aug 12 2010 Akira TAGOH - 1.6.0-1 +- new upstream release. + * Mon Mar 15 2010 Akira TAGOH - 1.5.7-3 - Use anthy-utf8 instead of anthy. - Set the appropriate encoding for uim.el.