--- a/icu/icu.spec	Thu Oct 21 15:03:32 2010 +0200
+++ b/icu/icu.spec	Fri Oct 22 12:35:11 2010 +0200
@@ -48,11 +48,11 @@
 Patch17: source_test_intltest_regextst.cpp.patch
 Patch18: source_test_intltest_regextst.h.patch
 Patch19: source_tools_pkgdata_dllmode.c.patch
-Patch20: source_i18n_Makefile.in.patch
+#Patch20: source_i18n_Makefile.in.patch
 Patch21: source_runConfigureICU.patch
-Patch22: source_layoutex_Makefile.in.patch
-Patch23: source_layout_Makefile.in.patch
-Patch24: source_common_Makefile.in.patch
+#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
@@ -116,11 +116,11 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
+#%patch20 -p1
 %patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
+#%patch22 -p1
+#%patch23 -p1
+#%patch24 -p1
 %patch25 -p1
 %patch26 -p1
 
@@ -143,7 +143,7 @@
 export CXX="${CXX} -norunpath"
 export CFLAGS="%optflags"
 export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -lCrun"
 
 #CFLAGS="%optflags" CXXFLAGS="%cxx_optflags" LDFLAGS="%_ldflags" ./configure --prefix=/usr --sysconfdir=/etc --with-data-packaging=files --enable-shared --enable-static --disable-samples --disable-64-bit-libs
 #./configure --prefix=%{_prefix} --libdir=%{_libdir} --sysconfdir=/etc --with-data-packaging=library --enable-shared --enable-static --disable-samples --disable-64bit-libs
@@ -165,7 +165,7 @@
 export CXX="${CXX} -norunpath"
 export CFLAGS="%optflags"
 export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -lCrun"
 
 #CFLAGS="%optflags64" CXXFLAGS="%cxx_optflags64" LDFLAGS="%_ldflags" ./configure --prefix=/usr/lib/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=files --enable-shared --enable-static --disable-samples
 #./configure --prefix=%{_prefix}/%{_arch64} --libdir=%{_libdir}/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=library --enable-shared --enable-static --disable-samples

--- a/icu/patches/source_runConfigureICU.patch	Thu Oct 21 15:03:32 2010 +0200
+++ b/icu/patches/source_runConfigureICU.patch	Fri Oct 22 12:35:11 2010 +0200
@@ -1,21 +1,21 @@
 --- icu.orig/source/runConfigureICU	2010-03-19 15:22:08.536807120 -0400
 +++ icu/source/runConfigureICU	2010-03-19 15:22:55.139213071 -0400
-@@ -138,8 +138,7 @@
+@@ -138,8 +138,6 @@
      Solaris)
          THE_OS=SOLARIS
          THE_COMP="Sun's CC"
 -        CC=`which cc`; export CC
 -        CXX=`which CC`; export CXX
-+        LDFLAGS="-L -lCrun";export LDFLAGS
          RELEASE_CFLAGS="-xO4 -xlibmil"
          RELEASE_CXXFLAGS="-O4 -xlibmil"
          ;;
-@@ -154,8 +153,6 @@
+@@ -154,9 +152,6 @@
      SolarisX86)
          THE_OS="SOLARIS X86"
          THE_COMP="Sun's CC"
 -        CC=`which cc`; export CC
 -        CXX=`which CC`; export CXX
-         LDFLAGS="-L -lCrun";export LDFLAGS
+-        LDFLAGS="-L -lCrun";export LDFLAGS
          RELEASE_CFLAGS=-xO3
          RELEASE_CXXFLAGS=-O3
+         ;;