--- a/icu/icu.spec	Thu Oct 21 13:29:09 2010 +0200
+++ b/icu/icu.spec	Thu Oct 21 15:03:32 2010 +0200
@@ -53,6 +53,9 @@
 Patch22: source_layoutex_Makefile.in.patch
 Patch23: source_layout_Makefile.in.patch
 Patch24: source_common_Makefile.in.patch
+#patches 25, 26 align tests to previous Oracle modifications
+Patch25: source_common_testdata_conversion.txt.patch
+Patch26: source_test_ccapitst.c.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}
 SUNW_Copyright: %{src_name}.copyright
@@ -118,6 +121,9 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
+
 #cat Makefile.config.in %{PATCH2} > Makefile.config
 #touch Makefile.depend
 
@@ -249,6 +255,7 @@
 * Thu Oct 21 2010 Pavel Heimlich <[email protected]>
 - fix 6966217 in the .so.3 libraries (old_libs)
 - add JDS includes
+- partial fix of 6944449(icu 4.0.1 test suites output some errors in locale ja_JP.)
 * Sun Mar 21 2010 Suresh Chandrasekharan <[email protected]>
 - Run runConfigureICU instead of configure. Pass OS version to that
 - Added patch for removing reassigning CC/CXX within runConfigureICU

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/patches/source_common_testdata_conversion.txt.patch	Thu Oct 21 15:03:32 2010 +0200
@@ -0,0 +1,31 @@
+--- icu/source/test/testdata/conversion.txt.orig	2008-12-11 02:10:35.588308000 +0000
++++ icu/source/test/testdata/conversion.txt	2010-10-14 14:15:23.366763329 +0000
+@@ -1037,7 +1037,7 @@
+         // moved from cintltst /tsconv/nccbtst/TestSkipCallBack
+         {
+           "iso-2022-jp",
+-          "\u3000\xe9\u3001",
++          "\u3000\u0600\u3001",
+           :bin{       1b2442212121221b2842 },
+           :intvector{ 0,0,0,0,0,2,2,2,2,2 },
+           :int{1}, :int{1}, "", "0", ""
+@@ -1045,7 +1045,7 @@
+         // moved from cintltst /tsconv/nccbtst/TestSubCallBack
+         {
+           "iso-2022-jp",
+-          "A\xe9B\xe9\u3000",
++          "A\u0600B\u0600\u3000",
+           :bin{       411a421a1b244221211b2842 },
+           :intvector{ 0,1,2,3,4,4,4,4,4,4,4,4 },
+           :int{1}, :int{1}, "", "?", ""
+@@ -1053,8 +1053,8 @@
+         // moved from cintltst /tsconv/nccbtst/TestSubWithValueCallBack
+         {
+           "iso-2022-jp",
+-          "A\xe9B\xe9\u3000",
+-          :bin{       41255530304539422555303045391b244221211b2842 },
++          "A\u0600B\u0600\u3000",
++	  :bin{       41255530363030422555303630301b244221211b2842 },
+           :intvector{ 0,1,1,1,1,1,1,2,3,3,3,3,3,3,4,4,4,4,4,4,4,4 },
+           :int{1}, :int{1}, "", "&", ""
+         }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/patches/source_test_ccapitst.c.patch	Thu Oct 21 15:03:32 2010 +0200
@@ -0,0 +1,24 @@
+--- icu/source/test/cintltst/ccapitst.c.orig	2008-06-04 17:49:37.846383000 +0000
++++ icu/source/test/cintltst/ccapitst.c	2010-10-14 14:17:19.434919551 +0000
+@@ -2814,8 +2814,8 @@
+         { 3, "CESU-8"},
+         { 3, "SCSU"},
+         { 4, "UTF-32"},
+-        { 4, "UTF-7"},
+-        { 4, "IMAP-mailbox-name"},
++        { 5, "UTF-7"},
++        { 8, "IMAP-mailbox-name"},
+         { 4, "BOCU-1"},
+ 
+         { 1, "windows-1256"},
+@@ -2830,8 +2830,8 @@
+         { 4, "HZ"},
+ 
+         { 3, "ISO-2022"},
+-        { 3, "ISO-2022-KR"},
+-        { 6, "ISO-2022-JP"},
++        { 8, "ISO-2022-KR"},
++        { 9, "ISO-2022-JP"},
+         { 8, "ISO-2022-CN"},
+ 
+         /* LMBCS */