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
Drop obsoletes/provides added in f14

m17n-db.spec

@@ -1,109 +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
-# FIXME: Remove these obsolets and provides in F16
+Patch6:     ta-lk-renganathan-650802.patch
-Obsoletes: m17n-db-amharic < 1.6.0-2
+Patch7:     zh-cangjie-do-not-commit-extra-space.patch
-Obsoletes: m17n-db-arabic < 1.6.0-2
-Obsoletes: m17n-db-armenian < 1.6.0-2
-Obsoletes: m17n-db-assamese < 1.6.0-2
-Obsoletes: m17n-db-bengali < 1.6.0-2
-Obsoletes: m17n-db-cham < 1.6.0-2
-Obsoletes: m17n-db-chinese < 1.6.0-2
-Obsoletes: m17n-db-common-cjk < 1.6.0-2
-Obsoletes: m17n-db-croatian < 1.6.0-2
-Obsoletes: m17n-db-danish < 1.6.0-2
-Obsoletes: m17n-db-dhivehi < 1.6.0-2
-Obsoletes: m17n-db-farsi < 1.6.0-2
-Obsoletes: m17n-db-flt < 1.6.0-2
-Obsoletes: m17n-db-french < 1.6.0-2
-Obsoletes: m17n-db-generic < 1.6.0-2
-Obsoletes: m17n-db-greek < 1.6.0-2 
-Obsoletes: m17n-db-gregorian < 1.6.0-2
-Obsoletes: m17n-db-gujarati < 1.6.0-2
-Obsoletes: m17n-db-hebrew < 1.6.0-2
-Obsoletes: m17n-db-hindi < 1.6.0-2
-Obsoletes: m17n-db-japanese < 1.6.0-2
-Obsoletes: m17n-db-kannada < 1.6.0-2
-Obsoletes: m17n-db-kazakh < 1.6.0-2
-Obsoletes: m17n-db-khmer < 1.6.0-2
-Obsoletes: m17n-db-korean < 1.6.0-2
-Obsoletes: m17n-db-lao < 1.6.0-2
-Obsoletes: m17n-db-latin < 1.6.0-2
-Obsoletes: m17n-db-malayalam < 1.6.0-2
-Obsoletes: m17n-db-myanmar < 1.6.0-2
-Obsoletes: m17n-db-oriya < 1.6.0-2
-Obsoletes: m17n-db-punjabi < 1.6.0-2
-Obsoletes: m17n-db-russian < 1.6.0-2
-Obsoletes: m17n-db-sanskrit < 1.6.0-2
-Obsoletes: m17n-db-serbian < 1.6.0-2
-Obsoletes: m17n-db-sinhala < 1.6.0-2
-Obsoletes: m17n-db-slovak < 1.6.0-2
-Obsoletes: m17n-db-swedish < 1.6.0-2
-Obsoletes: m17n-db-syriac < 1.6.0-2 
-Obsoletes: m17n-db-tamil < 1.6.0-2
-Obsoletes: m17n-db-telugu < 1.6.0-2
-Obsoletes: m17n-db-thai < 1.6.0-2
-Obsoletes: m17n-db-tibetan < 1.6.0-2 
-Obsoletes: m17n-db-uyghur < 1.6.0-2
-Obsoletes: m17n-db-vietnamese < 1.6.0-2
-
-Provides: m17n-db-amharic = %{version}-%{release}
-Provides: m17n-db-arabic = %{version}-%{release}
-Provides: m17n-db-armenian = %{version}-%{release}
-Provides: m17n-db-assamese = %{version}-%{release}
-Provides: m17n-db-bengali = %{version}-%{release}
-Provides: m17n-db-cham = %{version}-%{release}
-Provides: m17n-db-chinese = %{version}-%{release}
-Provides: m17n-db-common-cjk = %{version}-%{release}
-Provides: m17n-db-croatian = %{version}-%{release}
-Provides: m17n-db-danish = %{version}-%{release}
-Provides: m17n-db-dhivehi = %{version}-%{release}
-Provides: m17n-db-farsi = %{version}-%{release}
-Provides: m17n-db-flt = %{version}-%{release}
-Provides: m17n-db-french = %{version}-%{release}
-Provides: m17n-db-generic = %{version}-%{release}
-Provides: m17n-db-greek = %{version}-%{release}
-Provides: m17n-db-gregorian = %{version}-%{release}
-Provides: m17n-db-gujarati = %{version}-%{release}
-Provides: m17n-db-hebrew = %{version}-%{release}
-Provides: m17n-db-hindi = %{version}-%{release}
-Provides: m17n-db-japanese = %{version}-%{release}
-Provides: m17n-db-kannada = %{version}-%{release}
-Provides: m17n-db-kazakh = %{version}-%{release}
-Provides: m17n-db-khmer = %{version}-%{release}
-Provides: m17n-db-korean = %{version}-%{release}
-Provides: m17n-db-lao = %{version}-%{release}
-Provides: m17n-db-latin = %{version}-%{release}
-Provides: m17n-db-malayalam = %{version}-%{release}
-Provides: m17n-db-myanmar = %{version}-%{release}
-Provides: m17n-db-oriya = %{version}-%{release}
-Provides: m17n-db-punjabi = %{version}-%{release}
-Provides: m17n-db-russian = %{version}-%{release}
-Provides: m17n-db-sanskrit = %{version}-%{release}
-Provides: m17n-db-serbian = %{version}-%{release}
-Provides: m17n-db-sinhala = %{version}-%{release}
-Provides: m17n-db-slovak = %{version}-%{release}
-Provides: m17n-db-swedish = %{version}-%{release}
-Provides: m17n-db-syriac = %{version}-%{release} 
-Provides: m17n-db-tamil = %{version}-%{release}
-Provides: m17n-db-telugu = %{version}-%{release}
-Provides: m17n-db-thai = %{version}-%{release}
-Provides: m17n-db-tibetan = %{version}-%{release}
-Provides: m17n-db-uyghur = %{version}-%{release}
-Provides: m17n-db-vietnamese = %{version}-%{release}
-
 
 %description
 This package contains multilingualization (m17n) datafiles for m17n-lib
@@ -114,8 +27,6 @@ font layout text rendering for languages.
 Summary:  Extra m17n-db files
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Obsoletes: m17n-db-datafiles < 1.6.0-2
-Provides: m17n-db-datafiles = %{version}-%{release}
 
 %description extras
 m17n-db extra files for input maps that are less used.
@@ -136,6 +47,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 +100,11 @@ 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
+- Drop obsoletes/provides added in f14
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

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))

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