diff --git a/baselibs.conf b/baselibs.conf index 2afcfec..eb5a502 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,7 @@ uim + recommends "uim-gtk2- = " + recommends "uim-gtk3- = " + recommends "uim-qt4- = " uim-gtk2 post "%if "%_lib" == "lib64"" post "%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" @@ -10,6 +13,7 @@ uim-gtk2 postun "%else" postun "%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" postun "%endif" + requires "uim- = " supplements "packageand(uim:gtk2-)" uim-gtk3 post "%if "%_lib" == "lib64"" @@ -22,10 +26,11 @@ uim-gtk3 postun "%else" postun "%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" + requires "uim- = " supplements "packageand(uim:gtk3-)" uim-qt3 + requires "uim- = " supplements "packageand(uim:qt3-)" - obsoletes "uim-qt-" - provides "uim-qt- = " uim-qt4 + requires "uim- = " supplements "packageand(uim:libqt4-)" diff --git a/uim-1.8.1.tar.bz2 b/uim-1.8.1.tar.bz2 deleted file mode 100644 index 6048739..0000000 --- a/uim-1.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18c9a29e11f543b560bcf5d678f1d915cd73c1fef99725188b2d910f1c3ff8eb -size 6478153 diff --git a/uim-1.8.5.tar.bz2 b/uim-1.8.5.tar.bz2 new file mode 100644 index 0000000..5b34549 --- /dev/null +++ b/uim-1.8.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f74550b42d22a1e2bbc581039585541f7784eb6652a06ec17aa88bcf5f0f3d58 +size 6497675 diff --git a/uim.changes b/uim.changes index 479505d..ed1e200 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Apr 27 08:39:51 UTC 2013 - i@marguerite.su + +- update version 1.8.5 + * uim-gtk2/3 + ** Avoid an infinite recursion when no preedit is started (by tagoh) + * uim-tutcode + ** Fix behavior of postfix katakana conversion +- specfile clean + ------------------------------------------------------------------- Mon Jul 2 04:07:57 UTC 2012 - i@marguerite.su diff --git a/uim.spec b/uim.spec index f0f2343..979d170 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,20 +20,20 @@ %define is_gnome3 (0%{?suse_version} > 1140) Name: uim -Version: 1.8.1 +Version: 1.8.5 Release: 0 -Summary: A multilingual input method library -License: GPL-2.0+ +Summary: A multilingual input method framework +License: BSD-3-Clause Group: System/I18n/Japanese -Url: http://uim.freedesktop.org/wiki/ -Source0: http://uim.googlecode.com/files/uim-%{version}.tar.bz2 +Url: http://code.google.com/p/uim +Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim Source4: baselibs.conf -Patch10: uim-sigscheme-build-fixes.diff -Patch12: uim-fix-crash-in-firefox.diff -Patch13: fix-for-sles-qhash-incomplete-type.patch +Patch1: uim-sigscheme-build-fixes.diff +Patch2: uim-fix-crash-in-firefox.diff +Patch3: fix-for-sles-qhash-incomplete-type.patch BuildRequires: anthy-devel BuildRequires: canna-devel BuildRequires: emacs-x11 @@ -58,19 +58,24 @@ BuildRequires: xemacs BuildRequires: pkgconfig(gtk+-3.0) %endif Provides: locale(xorg-x11:ja) +Recommends: %{name}-gtk2 = %{version} +%if %build_gtk3 +Recommends: %{name}-gtk3 = %{version} +%endif +Recommends: %{name}-qt4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %{_bindir}/touch %description -Uim is a multilingual input method library. Uim's project goal is to -provide secure and useful input method for all languages. Currently, it -can input to applications which support gtk+'s immodule or XIM. +Uim is a multilingual input method framework. Uim's goal is to +provide simple, easily extensible and high code-quality input +method development platform, and useful input method environment +for users of desktop and embedded platforms. %package devel Summary: Include Files and Libraries mandatory for Development -Group: System/I18n/Japanese +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: glibc-devel %description devel Include Files and Libraries mandatory for Development. @@ -113,9 +118,7 @@ GNOME applet for uim Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} -Provides: uim-qt = %{version} Provides: locale(qt3:ja) -Obsoletes: uim-qt %description qt3 Qt3 input module plugin for uim @@ -124,7 +127,6 @@ Qt3 input module plugin for uim Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} -Requires: uim-qt = %{version} Provides: locale(libqt4:ja) %description qt4 @@ -132,9 +134,9 @@ Qt4 input module plugin for uim %package kde3 Summary: KDE3 Applet for Uim -Group: User Interface/Desktops -Requires: uim = %{version} -Requires: uim-qt3 +Group: System/GUI/KDE +Requires: %{name} = %{version} +Requires: %{name}-qt3 = %{version} %description kde3 Uim is a multilingual input method library. Uim aims to @@ -143,9 +145,9 @@ languages. %prep %setup0 -q -%patch10 -p1 -%patch12 -p1 -%patch13 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs