From 305ecabcee4d8575cc08a8e208191c8261ca25381e853f69a28ef0dfb2230e2d Mon Sep 17 00:00:00 2001
From: Luiz Fernando Ranghetti <elchevive68@gmail.com>
Date: Wed, 7 Mar 2012 12:50:31 +0000
Subject: [PATCH] Accepting request 108158 from home:tiwai:branches:M17N

- updated uim to 1.7.2, 1.7.3
  * Fix crash when text acquisition is invoked with selected text
  * Support text acquisition API with QTextEdit of Qt4
  * Fix behavior of text deletion API with QTextEdit of Qt4
  * Bug fixes for uim-m17nlib

OBS-URL: https://build.opensuse.org/request/show/108158
OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=34
---
 fix-libs.patch    | 25 -------------------------
 uim-1.7.1.tar.bz2 |  3 ---
 uim-1.7.3.tar.bz2 |  3 +++
 uim.changes       |  9 +++++++++
 uim.spec          | 10 ++++------
 5 files changed, 16 insertions(+), 34 deletions(-)
 delete mode 100644 fix-libs.patch
 delete mode 100644 uim-1.7.1.tar.bz2
 create mode 100644 uim-1.7.3.tar.bz2

diff --git a/fix-libs.patch b/fix-libs.patch
deleted file mode 100644
index 8efa068..0000000
--- a/fix-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: uim-1.7.1/uim/Makefile.am
-===================================================================
---- uim-1.7.1.orig/uim/Makefile.am	2010-05-28 03:53:01.000000000 +0200
-+++ uim-1.7.1/uim/Makefile.am	2011-09-05 12:15:49.355126241 +0200
-@@ -278,6 +278,7 @@ libuim_custom_enabler_la_CPPFLAGS = -I$(
- 
- libuim_counted_init_la_SOURCES = counted-init.c counted-init.h
- libuim_counted_init_la_CPPFLAGS = -I$(top_srcdir)
-+libuim_counted_init_la_LIBADD = libuim.la
- 
- if LIBUIM_X_UTIL
- libuim_x_util_la_SOURCES = uim-x-util.h uim-x-kana-input-hack.c
-Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
-===================================================================
---- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in	2011-03-27 03:48:08.000000000 +0200
-+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in	2011-09-05 12:33:56.412743578 +0200
-@@ -4,7 +4,7 @@ TEMPLATE = app
- 
- # to include qtgettext.h
- INCLUDEPATH += @srcdir@/..
--LIBS += -luim-custom -luim-counted-init @LIBINTL@
-+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
- 
- QMAKE_UIC = $$QMAKE_UIC -tr UIC_
- 
diff --git a/uim-1.7.1.tar.bz2 b/uim-1.7.1.tar.bz2
deleted file mode 100644
index 9d65810..0000000
--- a/uim-1.7.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
-size 6354866
diff --git a/uim-1.7.3.tar.bz2 b/uim-1.7.3.tar.bz2
new file mode 100644
index 0000000..0c5687e
--- /dev/null
+++ b/uim-1.7.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c
+size 6380469
diff --git a/uim.changes b/uim.changes
index 1c513ac..6539740 100644
--- a/uim.changes
+++ b/uim.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb 28 13:46:10 CET 2012 - tiwai@suse.de
+
+- updated uim to 1.7.2, 1.7.3
+  * Fix crash when text acquisition is invoked with selected text
+  * Support text acquisition API with QTextEdit of Qt4
+  * Fix behavior of text deletion API with QTextEdit of Qt4
+  * Bug fixes for uim-m17nlib
+
 -------------------------------------------------------------------
 Mon Feb 13 10:57:19 UTC 2012 - coolo@suse.com
 
diff --git a/uim.spec b/uim.spec
index 98990ab..7bd0985 100644
--- a/uim.spec
+++ b/uim.spec
@@ -42,13 +42,13 @@ BuildRequires:  gtk2-devel
 %if %build_gtk3
 BuildRequires:  pkgconfig(gtk+-3.0)
 %endif
+BuildRequires:  fdupes
 BuildRequires:  gnome-panel-devel
-BuildRequires:  qt3-devel
 BuildRequires:  kdebase3-devel
+BuildRequires:  qt3-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xemacs
-BuildRequires:  fdupes
-Version:        1.7.1
+Version:        1.7.3
 Release:        0
 # xorg-x11-libXdmcp-devel libgnomeprintui-devel
 Summary:        A multilingual input method library
@@ -61,7 +61,6 @@ Source2:        xemacs-auto-autoloads.el
 Source3:        etc-x11-xim.d-uim
 Source4:        baselibs.conf
 Patch10:        uim-sigscheme-build-fixes.diff
-Patch11:        fix-libs.patch
 Patch12:        uim-fix-crash-in-firefox.diff
 PreReq:         %{_bindir}/touch
 Provides:       locale(xorg-x11:ja)
@@ -119,8 +118,8 @@ GNOME applet for uim
 Summary:        Qt3 input module plugin for uim
 Group:          System/I18n/Japanese
 Requires:       %{name} = %{version}
-Provides:       locale(qt3:ja)
 Provides:       uim-qt = %{version}
+Provides:       locale(qt3:ja)
 Obsoletes:      uim-qt
 
 %description qt3
@@ -150,7 +149,6 @@ languages.
 %prep
 %setup0 -q
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 cp emacs/README README.emacs
 iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs