[m17n-db/f14/master] - update to new upstream release 1.6.2 - Drop kn-itrans-ZWNJ-221965.patch - Resolves:rh#650802-[si]

[pnemade]

commit 3883e421aadb10548f55915fa886932f055898b3
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Nov 9 14:27:30 2010 +0530

    - update to new upstream release 1.6.2
    - Drop kn-itrans-ZWNJ-221965.patch
    - 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

 .gitignore                                 |    1 +
 kn-itrans-ZWNJ-221965.patch                |   13 -------------
 m17n-db.spec                               |   20 +++++++++++++++-----
 sources                                    |    2 +-
 ta-lk-renganathan-650802.patch             |   13 +++++++++++++
 zh-cangjie-do-not-commit-extra-space.patch |   11 +++++++++++
 6 files changed, 41 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8e670e..373a96a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 m17n-db-1.6.1.tar.gz
+/m17n-db-1.6.2.tar.gz
diff --git a/m17n-db.spec b/m17n-db.spec
index f89ee63..536cd6c 100644
--- a/m17n-db.spec
+++ b/m17n-db.spec
@@ -1,18 +1,22 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.6.1
-Release:    3%{?dist}
+Version:    1.6.2
+Release:    1%{?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
-Patch3:     kn-itrans-ZWNJ-221965.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
 
 Obsoletes: m17n-db-amharic < 1.6.0-2
 Obsoletes: m17n-db-arabic < 1.6.0-2
@@ -124,7 +128,6 @@ m17n-db extra files for input maps that are less used.
 Summary:  Development files for m17n-db
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 m17n-db development files
@@ -135,9 +138,10 @@ m17n-db development files
 pushd MIM
 %patch1 -p1 -b .1~
 %patch2 -p1 -b .2~
-%patch3 -p0 -b .3~
 %patch4 -p0 -b .4~
 %patch5 -p0 -b .5~
+%patch6 -p0 -b .6~
+%patch7 -p0 -b .7~
 popd
 
 %build
@@ -189,6 +193,12 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %changelog
+* Wed Nov 10 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.2-1
+- update to new upstream release 1.6.2
+- Drop kn-itrans-ZWNJ-221965.patch
+- 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
+
 * Fri Jul 23 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-3
 - Fix the upgrade path from F13 to F14
 
diff --git a/sources b/sources
index c50d841..cfc1c49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b59004270e14c5e5806adc65e21e13a  m17n-db-1.6.1.tar.gz
+47a1db5107865a3aed7cd267faf86280  m17n-db-1.6.2.tar.gz
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