Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at Sun Aug 7 18:59:11 CEST 2011.
-------- --- uim/uim.changes 2011-05-31 18:26:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/uim/uim.changes 2011-08-01 12:58:00.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 29 17:36:56 CEST 2011 - ti...@suse.de + +- updated to uim-1.7.1: + Major updates, see release notes of 1.6.0, 1.6.1, 1.7.0 and + 1.7.1: + http://uim.googlecode.com/svn/tags/uim-1.6.0/RELNOTE + http://uim.googlecode.com/svn/tags/uim-1.6.1/RELNOTE + http://uim.googlecode.com/svn/tags/uim-1.7.0/RELNOTE + http://uim.googlecode.com/svn/tags/uim-1.7.1/RELNOTE +- Enabled Gtk3 IM build +- Re-enabled applet build for FACTORY, created uim-applet-gnome + sub-package +- Enable libedit properly +- Enable m17n-lib +- Clean up spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qt-build.patch uim-1.5.6.tar.bz2 uim-gnome-build-fixes.diff New: ---- uim-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.30pbu8/_old 2011-08-07 18:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.30pbu8/_new 2011-08-07 18:57:41.000000000 +0200 @@ -16,8 +16,8 @@ # -# The applet does not work currently on Factory, as it has not been ported to libpanelapplet-4.0 yet. -%define build_applet 0%{?suse_version} <= 1140 +%define build_gtk3 (%{suse_version} >= 1140) +%define is_gnome3 (%{suse_version} > 1140) Name: uim BuildRequires: anthy-devel @@ -32,40 +32,36 @@ BuildRequires: ncurses-devel BuildRequires: perl-XML-Parser BuildRequires: pkg-config +BuildRequires: m17n-lib-devel +BuildRequires: libedit-devel %if %suse_version > 1130 BuildRequires: pkgconfig(gtk+-2.0) %else BuildRequires: gtk2-devel %endif -%if %{?build_applet} -BuildRequires: gnome-panel-devel +%if %build_gtk3 +BuildRequires: pkgconfig(gtk+-3.0) %endif +BuildRequires: gnome-panel-devel BuildRequires: qt3-devel BuildRequires: update-desktop-files BuildRequires: xemacs %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 1.5.6 -Release: 16 +Version: 1.7.1 +Release: 1 # xorg-x11-libXdmcp-devel libgnomeprintui-devel License: GPLv2+ Summary: A multilingual input method library Url: http://uim.freedesktop.org/wiki/ Group: System/I18n/Japanese -# svn co http://freedesktop.org:8080/svn/uim/trunk -# Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2 -# freedesktop svn archive is broken. Currently there is an snapshot of -# a new svn repository available which is updated every hour: -# http://freedesktop.org/~tkng/uim-trunk.tar.gz -Source0: http://uim.freedesktop.org/releases/uim-%{version}.tar.bz2 +Source0: http://uim.googlecode.com/files/uim-%{version}.tar.bz2 Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim Source4: baselibs.conf -Patch1: qt-build.patch Patch10: uim-sigscheme-build-fixes.diff -Patch11: uim-gnome-build-fixes.diff PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -87,16 +83,40 @@ %package gtk2 License: GPLv2+ -Summary: Control applet using gnome2 +Summary: GTK+2.0 IM module for uim +Group: System/I18n/Japanese +Requires: %{name} = %{version} +Provides: locale(gtk2:ja) +%gtk2_immodule_requires + +%description gtk2 +GTK+2.0 IM module for uim + +%if %{build_gtk3} + +%package gtk3 +License: GPLv2+ +Summary: GTK+3.0 IM module for uim +Group: System/I18n/Japanese +Requires: %{name} = %{version} +Provides: locale(gtk3:ja) +%gtk3_immodule_requires + +%description gtk3 +GTK+3.0 IM module for uim +%endif + +%package applet-gnome +License: GPLv2+ +Summary: GNOME applet for uim Group: System/I18n/Japanese Requires: %{name} = %{version} Obsoletes: uim-applet Provides: uim-applet Provides: locale(gnome-libs:ja) -%gtk2_immodule_requires -%description gtk2 -Control applet using gnome2 +%description applet-gnome +GNOME applet for uim %package qt License: GPLv2+ @@ -121,11 +141,7 @@ %prep %setup0 -q -%patch1 -p1 %patch10 -p1 -%if 0%{?suse_version} >= 1110 -%patch11 -p1 -%endif cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs @@ -133,16 +149,15 @@ autoreconf -f -i intltoolize --force cp po/Makefile.in.in qt/chardict/po +cp po/Makefile.in.in qt4/chardict/po %configure --disable-static --with-pic \ --libexecdir=%{_prefix}/lib/uim \ - --without-m17nlib\ --with-canna\ --with-anthy-utf8 \ --with-qt\ --with-qt-immodule \ - --with-qt4-immodule \ - --with-libedit -# --disable-scm-nested-eval --enable-callback-queue\ + --with-qt4 \ + --with-qt4-immodule make %{?_smp_mflags} %install @@ -199,6 +214,7 @@ %fdupes %{buildroot}%{_prefix}/share %endif find %{buildroot} -type f -name "*.la" -delete -print +rm -f doc/Makefile* %clean rm -rf %{buildroot} @@ -208,8 +224,9 @@ # register uim modules to uim. This will change the files: # %{_datadir}/uim/installed-modules.scm # %{_datadir}/uim/loader.scm -# %{_datadir}/uim/modules -uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode hangul viqr ipa-x-sampa latin +uim-module-manager --register \ + ajax-ime anthy anthy-utf8 byeoru canna elatin hangul ipa-x-sampa \ + latin m17nlib pyload skk tcode trycode tutcode viqr %postun -p /sbin/ldconfig @@ -219,20 +236,26 @@ %postun gtk2 %gtk2_immodule_postun -%files -n uim -f uim.lang +%if %{build_gtk3} + +%post gtk3 +%gtk3_immodule_post + +%postun gtk3 +%gtk3_immodule_postun +%endif + +%files -f uim.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README* %doc doc %dir %{_sysconfdir}/X11/xim.d/ %{_sysconfdir}/X11/xim.d/* -%dir %{_datadir}/uim -%dir %{_datadir}/uim/lib +%{_datadir}/uim # autogenerated by uim-module-manager: %ghost %{_datadir}/uim/installed-modules.scm %ghost %{_datadir}/uim/loader.scm %ghost %{_datadir}/uim/modules -%dir %{_datadir}/uim/pixmaps/ -%{_datadir}/uim/pixmaps/* %{_bindir}/uim-sh %{_bindir}/uim-module-manager %{_bindir}/uim-xim @@ -240,55 +263,66 @@ %{_bindir}/uim-fep-tick %{_bindir}/uim-el-agent %{_bindir}/uim-el-helper-agent +%{_bindir}/uim-help +%{_bindir}/uim-m17nlib-relink-icons %{_libdir}/*.so.* %dir %{_libdir}/uim %if "%{_libdir}" != "%{_prefix}/lib" %dir %{_prefix}/lib/uim %endif %{_prefix}/lib/uim/uim-helper-server -%{_prefix}/lib/uim/uim-candwin-gtk %dir %{_libdir}/uim/plugin/ %{_libdir}/uim/plugin/*.so %doc %{_mandir}/man1/*.1.gz %{_datadir}/applications/%{name}.desktop %{_datadir}/emacs/site-lisp/* -%dir %{_datadir}/xemacs/site-packages/ -%dir %{_datadir}/xemacs/site-packages/lisp/ -%dir %{_datadir}/xemacs/site-packages/lisp/uim-el/ -%{_datadir}/xemacs/site-packages/lisp/uim-el/* +%{_datadir}/xemacs/site-packages -%files -n uim-devel +%files devel %defattr(-, root, root) %{_libdir}/*.so %{_includedir}/uim/ %{_libdir}/pkgconfig/uim.pc -%files -n uim-gtk2 +%files gtk2 %defattr(-, root, root) -%{_bindir}/uim-im-switcher-gtk +%{_bindir}/uim-*-gtk +%{_bindir}/uim-*-gtk-* %{_bindir}/uim-input-pad-ja -%{_bindir}/uim-toolbar-gtk -%{_bindir}/uim-toolbar-gtk-systray -%{_bindir}/uim-pref-gtk -%if %{build_applet} +%{_prefix}/lib/uim/uim-*-gtk +%{_libdir}/gtk-2*/*/immodules/*.so + +%if %{build_gtk3} + +%files gtk3 +%defattr(-, root, root) +%{_bindir}/uim-*-gtk3 +%{_bindir}/uim-*-gtk3-* +%{_prefix}/lib/uim/uim-*-gtk3 +%{_libdir}/gtk-3*/*/immodules/*.so +%endif + +%files applet-gnome +%defattr(-, root, root) +%if %{is_gnome3} +%{_prefix}/lib/uim/uim-toolbar-applet-gnome3 +%{_datadir}/gnome-panel/*/applets +%{_datadir}/dbus-1/services/* +%else %{_prefix}/lib/uim/uim-toolbar-applet -%{_libdir}/bonobo/servers/*.server +%{_libdir}/bonobo/servers/* %endif -%{_libdir}/gtk-*/*/immodules/*.so -%files -n uim-qt -f uim-chardict-qt.lang +%files qt -f uim-chardict-qt.lang %defattr(-, root, root) -%{_bindir}/uim-chardict-qt -%{_bindir}/uim-im-switcher-qt -%{_bindir}/uim-pref-qt -%{_bindir}/uim-toolbar-qt +%{_bindir}/uim-*-qt +%{_prefix}/lib/uim/uim-*-qt %{_prefix}/lib/qt3/plugins/inputmethods/*.so -%{_prefix}/lib/uim/uim-candwin-qt -%dir %{_datadir}/uim/helperdata/ -%{_datadir}/uim/helperdata/bushu.t -%files -n uim-qt4 -f uim-chardict-qt.lang +%files qt4 -f uim-chardict-qt.lang %defattr(-, root, root) -%{_libdir}/qt4/plugins/inputmethods/* +%{_bindir}/uim-*-qt4 +%{_prefix}/lib/uim/uim-*-qt4 +%{_libdir}/qt4/plugins/inputmethods/*.so %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.30pbu8/_old 2011-08-07 18:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.30pbu8/_new 2011-08-07 18:57:41.000000000 +0200 @@ -1,5 +1,9 @@ uim uim-gtk2 supplements "packageand(uim-gtk2:gtk2-<targettype>)" +uim-gtk3 + supplements "packageand(uim-gtk3:gtk3-<targettype>)" uim-qt supplements "packageand(uim-qt:qt3-<targettype>)" +uim-qt4 + supplements "packageand(uim-qt4:libqt4-<targettype>)" ++++++ etc-x11-xim.d-uim ++++++ --- /var/tmp/diff_new_pack.30pbu8/_old 2011-08-07 18:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.30pbu8/_new 2011-08-07 18:57:41.000000000 +0200 @@ -5,10 +5,6 @@ echo "uim-xim is not available." return 1 fi -if ! rpm -q uim-qt > /dev/null 2>&1 ; then - echo "uim-qt package is not installed." - return 1 -fi export XMODIFIERS="@im=uim" export GTK_IM_MODULE=uim @@ -17,6 +13,47 @@ uim-xim & +case "$WINDOWMANAGER" in + *gnome*) + # if applet is available, no need to start additional programs here + if rpm -q uim-applet-gnome > /dev/null 2>&1 ; then + PATH=$OLD_PATH + # success: + return 0 + fi;; +esac + +# start system-tray or stand-alone tool + +look_for_uim_toolbar () { + local p + for p in $*; do + if type -p "$p" > /dev/null 2>&1; then + toolbar="$p" + return 0 + fi + done +} + +toolbar="" +look_for_uim_toolbar uim-toolbar-gtk3-systray uim-toolbar-gtk-systray + +if [ -z "$toolbar" ]; then + # no systray found, let's start a stand-alone toolbar + case "$WINDOWMANAGER" in + *kde*) + look_for_uim_toolbar \ + uim-toolbar-qt4 uim-toolbar-qt \ + uim-toolbar-gtk3 uim-toolbar-gtk;; + *) + look_for_uim_toolbar \ + uim-toolbar-gtk3 uim-toolbar-gtk \ + uim-toolbar-qt4 uim-toolbar-qt;; + esac +fi +test -n "$toolbar" && $toolbar & +unset toolbar + PATH=$OLD_PATH # success: ++++++ uim-1.5.6.tar.bz2 -> uim-1.7.1.tar.bz2 ++++++ uim/uim-1.5.6.tar.bz2 /mounts/work_src_done/STABLE/uim/uim-1.7.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
