Accepting request 173565 from home:MargueriteSu:branches:M17N

update 1.8.5

OBS-URL: https://build.opensuse.org/request/show/173565
OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=39

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