From 3828d3d40e2f0ddf706da0a03ade045ed3d4f06e Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Thu, 31 Jan 2008 15:25:55 +0000
Subject: [PATCH] Resolves: rhbz#431029, rhbz#424661 Remove workaround for 0D31
 characters

---
 icu.icu5431.malayam.patch | 7 +++----
 icu.spec                  | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/icu.icu5431.malayam.patch b/icu.icu5431.malayam.patch
index b1f83a5..9897452 100644
--- a/icu.icu5431.malayam.patch
+++ b/icu.icu5431.malayam.patch
@@ -75,15 +75,14 @@
                  if (IndicClassTable::isConsonant(charClass)) {
                      if (postBaseLimit == 0 || seenVattu ||
                          (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
-@@ -645,6 +720,21 @@
+@@ -645,6 +720,20 @@
                  output.writeChar(chars[i], i, tagArray4);
              }
  
-+            /* for the special conjuction of Cons+0x0d4d+0x0d31 or Cons+0x0d4d+0x0d30 of Malayalam */
++            /* for the special conjuction of Cons+0x0d4d+0x0d30 of Malayalam */
 +            if ((baseConsonant - 2 >= 0) &&
 +                (chars[baseConsonant - 1] == 0x0d4d) &&
-+		((chars[baseConsonant] == 0x0d31) || 
-+		 (chars[baseConsonant] == 0x0d30)) &&
++		 (chars[baseConsonant] == 0x0d30) &&
 +                ((chars[baseConsonant - 2] >= 0x0d15) &&
 +                 (chars[baseConsonant - 2] <= 0x0d39)))  {
 +               if (baseConsonant < 3 || chars[baseConsonant - 3] != 0x0d4d) {
diff --git a/icu.spec b/icu.spec
index c37b97e..f6069a1 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   3.8.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Thu Jan 31 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-4
+- Resolves: rhbz#431029, rhbz#424661 Remove workaround for 0D31 characters
+
 * Fri Jan 25 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-3
 - CVE-2007-4770 CVE-2007-4771 add icu.regexp.patch
 - Resolves: rhbz#423211 fix malalayam stuff in light of syllable