[m17n-db/f15/master] Resolves:rh#650802-[si] stick characters with cursor, while input with si-wijesekera.mim Resolves:rh

[pnemade]

commit c3c7a94b9d4e6147079b688fcd5aa775e47e8d42
Author: Parag Nemade <pnemade at redhat.com>
Date:   Thu Mar 24 12:17:02 2011 +0530

    Resolves:rh#650802-[si] stick characters with cursor, while input with si-wijesekera.mim
    Resolves:rh#651289-zh-cangjie.mim: excessive space after committing Chinese word

 m17n-db.spec                               |   13 ++++++++++++-
 ta-lk-renganathan-650802.patch             |   13 +++++++++++++
 zh-cangjie-do-not-commit-extra-space.patch |   11 +++++++++++
 3 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/m17n-db.spec b/m17n-db.spec
index 5786859..9f1cfb8 100644
--- a/m17n-db.spec
+++ b/m17n-db.spec
@@ -1,17 +1,22 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.6.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
 Source0:    http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
 BuildArch:  noarch
 BuildRequires: gettext
+
+# Fedora speicifc patches
 Patch1:     number_pad_itrans-222634.patch
 Patch2:     bn-itrans-t-182227.patch
 Patch4:     kn-itrans_key-summary_228806.patch
 Patch5:     ml-itrans-keysummary-435260.patch
+# Upstream patches
+Patch6:     ta-lk-renganathan-650802.patch
+Patch7:     zh-cangjie-do-not-commit-extra-space.patch
 
 # FIXME: Remove these obsolets and provides in F16
 Obsoletes: m17n-db-amharic < 1.6.0-2
@@ -136,6 +141,8 @@ pushd MIM
 %patch2 -p1 -b .2~
 %patch4 -p0 -b .4~
 %patch5 -p0 -b .5~
+%patch6 -p0 -b .6~
+%patch7 -p0 -b .7~
 popd
 
 %build
@@ -187,6 +194,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %changelog
+* Thu Mar 24 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.2-3
+- Resolves:rh#650802-[si] stick characters with cursor, while input with si-wijesekera.mim
+- Resolves:rh#651289-zh-cangjie.mim: excessive space after committing Chinese word
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/ta-lk-renganathan-650802.patch b/ta-lk-renganathan-650802.patch
new file mode 100644
index 0000000..fabc3eb
--- /dev/null
+++ b/ta-lk-renganathan-650802.patch
@@ -0,0 +1,13 @@
+--- ta-lk-renganathan.mim	2009/10/21 08:15:52	1.2
++++ ta-lk-renganathan.mim	2010/10/25 10:35:54	1.3
+@@ -586,7 +586,9 @@
+   (aa "ா" (commit))			; 0BBE
+   (e  "ெ" (shift e-state))		; 0BC6
+   (ee "ே" (shift ee-state))		; 0BC7
+-  (ai "ை" (shift ai-state)))		; 0BC8
++  (ai "ை" (shift ai-state))		; 0BC8
++  (nil
++   (unhandle)))
+ 
+  (c-state
+   (sign (shift c-s-state))
diff --git a/zh-cangjie-do-not-commit-extra-space.patch b/zh-cangjie-do-not-commit-extra-space.patch
new file mode 100644
index 0000000..ca35215
--- /dev/null
+++ b/zh-cangjie-do-not-commit-extra-space.patch
@@ -0,0 +1,11 @@
+--- zh-util.mim	11 Jul 2008 01:28:53 -0000	1.3
++++ zh-util.mim	5 Nov 2010 07:07:48 -0000
+@@ -65,7 +65,7 @@
+   ((BackSpace)))
+ 
+  (commit-preedit
+-  ((S-\ ))))
++  ((\ ))))
+ 
+ (state
+  (check-undo