icu: switch to 4.2.1 from RHEL-6

1 files changed, 109 insertions, 247 deletions

diff --git a/icu.spec b/icu.spec
index f76002d..a293e27 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,27 +1,23 @@
 Name:      icu
-Version:   49.1.1
-Release:   8%{?dist}
+Version:   4.2.1
+Release:   9.1%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
 URL:       http://www.icu-project.org/
-Source0:   http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-src.tgz
-Source1:   icu-config.sh
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: doxygen, autoconf, python
-
+Source0:   http://download.icu-project.org/files/icu4c/4.2.1/icu4c-4_2_1-src.tgz
+Source1:   icu-config
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: doxygen, autoconf
 Requires: lib%{name} = %{version}-%{release}
 
-Patch1: icu.8198.revert.icu5431.patch
-Patch2: icu.8800.freeserif.crash.patch
-Patch3: icu.7601.Indic-ccmp.patch
-Patch4: icu.9283.regexcmp.crash.patch
-Patch5: gennorm2-man.patch
-Patch6: gencfu-man.patch
-Patch7: icuinfo-man.patch
-Patch8: icu.9737.CVE-2013-0900_changesets_32865_32908.patch
-Patch9: CVE-2013-0900_umutex.patch
+Patch1:  icu-3.4-multiarchdevel.patch
+Patch2:  icu.6995.kannada.patch
+Patch3:  icu.icu7039.badextract.patch
+Patch4:  icu.6969.pkgdata.patch
+Patch5:  icu.XXXX.install.patch
+Patch6:  icu.7119.s390x.patch
+Patch7:  canonicalize.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -59,65 +55,42 @@ BuildArch: noarch
 %description -n lib%{name}-doc
 %{summary}.
 
-%{!?endian: %global endian %(%{__python} -c "import sys;print (0 if sys.byteorder=='big' else 1)")}
-# " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
-
 %prep
 %setup -q -n %{name}
-%patch1 -p2 -R -b .icu8198.revert.icu5431.patch
-%patch2 -p1 -b .icu8800.freeserif.crash.patch
-%patch3 -p1 -b .icu7601.Indic-ccmp.patch
-%patch4 -p1 -b .icu9283.regexcmp.crash.patch
-%patch5 -p1 -b .gennorm2-man.patch
-%patch6 -p1 -b .gencfu-man.patch
-%patch7 -p1 -b .icuinfo-man.patch
-%patch8 -p1 -b .icu9737.CVE-2013-0900_changesets_32865_32908.patch
-%patch9 -p1 -b .CVE-2013-0900_umutex.patch
+%patch1 -p1 -b .multiarchdevel
+%patch2 -p1 -b .icu6995.kannada.patch
+%patch3 -p1 -b .icu7039.badextract.patch
+%patch4 -p0 -b .icu.6969.pkgdata.patch
+%patch5 -p1 -b .icu.XXXX.install.patch
+%patch6 -p1 -b .icu.7119.s390x.patch
+%patch7 -p0 -b .canonicalize.patch
 
 %build
 cd source
 autoconf
 CFLAGS='%optflags -fno-strict-aliasing'
 CXXFLAGS='%optflags -fno-strict-aliasing'
-# Endian: BE=0 LE=1
-%if ! 0%{?endian}
-CPPFLAGS='-DU_IS_BIG_ENDIAN=1'
-%endif
 %configure --with-data-packaging=library --disable-samples
 #rhbz#225896
-sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
-#rhbz#681941
-sed -i 's|^LIBS =.*|LIBS = -L../lib -licuuc -lpthread -lm|' i18n/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -licui18n -lc -lgcc|' io/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -lc|' layout/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../lib -licuuc -licule -lc|' layoutex/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../../lib -licutu -licuuc -lc|' tools/ctestfw/Makefile
-sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../../lib -licui18n -licuuc -lpthread -lc|' tools/toolutil/Makefile
-#rhbz#813484
-sed -i 's| \$(docfilesdir)/installdox||' Makefile
-# There is no source/doc/html/search/ directory
-sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
-
-make %{?_smp_mflags}
-make %{?_smp_mflags} doc
+sed -i -- "s/-nodefaultlibs -nostdlib//" config/mh-linux
+make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
+make doc
 
 %install
 rm -rf $RPM_BUILD_ROOT source/__docs
-make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT
-make %{?_smp_mflags} -C source install-doc docdir=__docs
+make -C source install DESTDIR=$RPM_BUILD_ROOT
+make -C source install-doc docdir=__docs
 chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-(
- cd $RPM_BUILD_ROOT%{_bindir}
- mv icu-config icu-config-%{__isa_bits}
-)
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
+sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 
 %check
-# test to ensure that -j(X>1) didn't "break" man pages. b.f.u #2357
-if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then
-    exit 1
-fi
-make %{?_smp_mflags} -C source check
+make -C source check
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post -n lib%{name} -p /sbin/ldconfig
 
@@ -125,6 +98,7 @@ make %{?_smp_mflags} -C source check
 
 %files
 %defattr(-,root,root,-)
+%doc license.html readme.html
 %{_bindir}/derb
 %{_bindir}/genbrk
 %{_bindir}/gencfu
@@ -136,7 +110,6 @@ make %{?_smp_mflags} -C source check
 %{_bindir}/uconv
 %{_sbindir}/*
 %{_mandir}/man1/derb.1*
-%{_mandir}/man1/gencfu.1*
 %{_mandir}/man1/gencnval.1*
 %{_mandir}/man1/genrb.1*
 %{_mandir}/man1/genbrk.1*
@@ -148,19 +121,16 @@ make %{?_smp_mflags} -C source check
 
 %files -n lib%{name}
 %defattr(-,root,root,-)
-%doc license.html readme.html
 %{_libdir}/*.so.*
 
 %files -n lib%{name}-devel
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-config*
-%{_bindir}/icuinfo
+%{_bindir}/%{name}-config
 %{_mandir}/man1/%{name}-config.1*
-%{_mandir}/man1/icuinfo.1*
 %{_includedir}/layout
 %{_includedir}/unicode
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/icu.pc
 %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{version}
@@ -171,162 +141,54 @@ make %{?_smp_mflags} -C source check
 
 %files -n lib%{name}-doc
 %defattr(-,root,root,-)
-%doc license.html readme.html
 %doc source/__docs/%{name}/html/*
 
 %changelog
-* Wed Mar 20 2013 Remi Collet <RPMS@famillecollet.com> - 49.1.1-8
-- backport for remi repo for EL-5
-
-* Wed Mar 06 2013 Eike Rathke <erack@redhat.com> - 49.1.1-8
-- Resolves: rhbz#918168 CVE-2013-0900 race condition allows DoS
-
-* Sat Feb 23 2013 Eike Rathke <erack@redhat.com> - 49.1.1-7
-- added manpages for gennorm2, gencfu and icuinfo, rhbz#884035
-
-* Fri Jan 25 2013 Eike Rathke <erack@redhat.com> - 49.1.1-6
-- Resolves: rhbz#889781 big endian build breakage
-
-* Fri Aug 31 2012 Tom Callaway <spot@fedoraproject.org> - 49.1.1-5
-- apply upstream fix (bug 9283) for regexcmp crash causing Chromium segfaults
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 49.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 15 2012 Caolán McNamara <caolanm@redhat.com> - 49.1.1-3
-- probably parallel-build safe by now. Add a check for original breakage
-
-* Fri Jun 15 2012 Caolán McNamara <caolanm@redhat.com> - 49.1.1-2
-- Resolves: rhbz#804313 multi-lib pain
-
-* Thu Apr 19 2012 Eike Rathke <erack@redhat.com> - 49.1.1-1
-- Update to 49.1.1
-
-* Thu Apr 19 2012 Eike Rathke <erack@redhat.com> - 4.8.1.1-3
-- Resolves: rhbz#813484 doxygen 1.8.0 does not provide installdox, omit from install
-
-* Mon Jan 30 2012 Jon Masters <jcm@jonmasters.org> - 4.8.1.1-2
-- Correct reference to BZ681941, add temporary fix for ARM FTBFS side effect
-
-* Fri Jan 20 2012 Peter Robinson <pbrobinson@fedoraproject.org> -4.8.1.1-1
-- Update to 4.8.1.1
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 13 2011 Eike Rathke <erack@redhat.com> - 4.8.1-3
-- Resolves: rhbz#766542 CVE-2011-4599 Stack-based buffer overflow
-- add icu.8984.CVE-2011-4599.patch
-
-* Mon Oct 24 2011 Caolán McNamara <caolanm@redhat.com> - 4.8.1-2
-- Resolves: rhbz#747193 try and enable ccmp for Indic fonts
+* Mon Dec 12 2011 Caolan McNamara <caolanm@redhat.com> - 4.2.1-9.1
+- Resolves: rhbz#766539 CVE-2011-4599 localeID overflow
 
-* Wed Sep 07 2011 Caolán McNamara <caolanm@redhat.com> - 4.8.1-1
-- Resolves: rhbz#681941 don't link unneccessary -lm, etc.
-- add icu.8800.freeserif.crash.patch
-
-* Tue Mar 08 2011 Caolán McNamara <caolanm@redhat.com> - 4.6-2
-- Resolves: rhbz#681941 don't link unneccessary -lm, etc.
-
-* Mon Mar 07 2011 Caolán McNamara <caolanm@redhat.com> - 4.6-1
-- latest version
-- upgrade includes a .pc now of its own, drop ours
-- drop integrated icu.6995.kannada.patch
-- drop integrated icu.7971.buildfix.patch
-- drop integrated icu.7972.buildfix.patch
-- drop integrated icu.7932.doublecompare.patch
-- drop integrated icu.8011.buildfix.patch
-
-* Fri Feb 11 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-8
-- Resolves: rhbz#674328 yet more ways that freeserif crashes libicu
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Feb 03 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-6
-- Resolves: rhbz#674328 more ways that freeserif crashes libicu
-
-* Wed Feb 02 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-5
-- Resolves: rhbz#674328 freeserif crashes libicu
-
-* Thu Jan 13 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-4
-- Resolves: rhbz#669237 strip libicudata
-
-* Mon Nov 29 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.2-3
-- Resolves: rhbz#657964 icu-config bindir returns sbindir
-
-* Thu Nov 25 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.2-2
-- Resolves: rhbz#654200 revert icu#5431
-
-* Mon Oct 04 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.2-1
-- latest version
-
-* Wed Sep 29 2010 jkeating - 4.4.1-6
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 22 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.1-5
-- upstream patches
-
-* Thu Sep 09 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.1-4
-- Resolves: rhbz#631403 doxygen no longer generates gifs
-
-* Thu Jul 08 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.1-3
-- move licences into libicu, and add them into the -doc subpackage
-  as well
-
-* Wed May 26 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.1-2
+* Thu May 27 2010 Caolan McNamara <caolanm@redhat.com> - 4.2.1-9
 - Resolves: rhbz#596171 drop icu.icu6284.strictalias.patch and use
   -fno-strict-aliasig as upstream has added a pile more and doesn't look
   interested in proposed patchs
 
-* Thu Apr 29 2010 Caolán McNamara <caolanm@redhat.com> - 4.4.1-1
-- latest version
-- drop integrated icu.icu7567.libctest.patch
+* Thu Apr 01 2010 Caolan McNamara <caolanm@redhat.com> - 4.2.1-8
+- Resolves: rhbz#578749 clarify license
 
-* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 4.4-1
-- latest version
-- drop integrated icu.6969.pkgdata.patch
-- drop integrated icu.icu7039.badextract.patch
-- drop integrated icu.XXXX.buildfix.patch
-
-* Wed Dec 02 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-8
+* Wed Dec 02 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-7
 - Resolves: rhbz#543386 update icu-config
 
-* Thu Nov 19 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-7
-- Fix FTBFS with yet another autoconf version that changes
-  behaviour
-
-* Mon Aug 31 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-6
+* Tue Sep 01 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-6
 - Resolves: rhbz#520468 fix s390x and other secondary archs
 
-* Tue Jul 28 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-5
+* Tue Jul 28 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-5
 - icu#7039 fix broken use of extract to get tests working
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jul 22 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-3
+* Wed Jul 22 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-3
 - make documentation noarch
 
-* Tue Jul 14 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-2
+* Tue Jul 14 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-2
 - rpmlint warnings
 
-* Fri Jul 03 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.1-1
+* Fri Jul 03 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-1
 - 4.2.1 release
 
-* Fri Jun 26 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.0.1-3
+* Fri Jun 26 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-3
 - Resolves: rhbz#508288 multilib conflict
 
-* Thu Jun 11 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.0.1-2
+* Thu Jun 11 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-2
 - Resolves: rhbz#505252 add icu.6995.kannada.patch
 
-* Mon Jun 08 2009 Caolán McNamara <caolanm@redhat.com> - 4.2.0.1-1
+* Mon Jun 08 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-1
 - 4.2.0.1 release
 
-* Sat May 09 2009 Caolán McNamara <caolanm@redhat.com> - 4.2-1
+* Sat May 09 2009 Caolan McNamara <caolanm@redhat.com> - 4.2-1
 - 4.2 release
 
-* Sun May 03 2009 Caolán McNamara <caolanm@redhat.com> - 4.2-0.1.d03
+* Sun May 03 2009 Caolan McNamara <caolanm@redhat.com> - 4.2-0.1.d03
 - 4.2 release candidate
 - drop resolved icu.icu6008.arm.padding.patch
 - drop resolved icu.icu6439.bare.elif.patch
@@ -334,100 +196,100 @@ make %{?_smp_mflags} -C source check
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 03 2009 Caolán McNamara <caolanm@redhat.com> - 4.0.1-2
+* Tue Feb 03 2009 Caolan McNamara <caolanm@redhat.com> - 4.0.1-2
 - fix bare elif for gcc-4.4
 
-* Fri Jan 16 2009 Caolán McNamara <caolanm@redhat.com> - 4.0.1-1
+* Fri Jan 16 2009 Caolan McNamara <caolanm@redhat.com> - 4.0.1-1
 - 4.0.1 release
 
-* Mon Dec 29 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-6
+* Mon Dec 29 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-6
 - Resolves rhbz#225896 clean up low hanging rpmlint warnings
 
-* Tue Dec 16 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-5
+* Tue Dec 16 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-5
 - drop integrated icu.icu5557.safety.patch
 
-* Thu Nov 20 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-4
+* Thu Nov 20 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-4
 - annoyingly upstream tarball was repacked apparently to remove 
   some unused/cached dirs
 
-* Sat Sep 06 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-3
+* Sat Sep 06 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-3
 - Resolves: rhbz#461348 wrong icu-config
 
-* Tue Aug 26 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-2
+* Tue Aug 26 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-2
 - Resolves: rhbz#459698 drop Malayalam patches. Note test with Rachana/Meera
   instead of Lohit Malayalam before filing bugs against icu wrt.
   Malayalam rendering
 
-* Sat Jul 05 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-1
+* Sat Jul 05 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-1
 - final release
 
-* Mon Jun 30 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-0.3.d03
+* Mon Jun 30 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-0.3.d03
 - 4.0 release candidate
 
-* Wed Jun 04 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-0.2.d02
+* Wed Jun 04 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-0.2.d02
 - drop icu.icu5498.openoffice.org.patch
 
-* Sun May 31 2008 Caolán McNamara <caolanm@redhat.com> - 4.0-0.1.d02
+* Sun May 31 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-0.1.d02
 - 4.0 release candidate
 - drop integrated icu.regexp.patch
 
-* Mon May 19 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-8
+* Mon May 19 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-8
 - add icu.icu6284.strictalias.patch and build with 
   strict-aliasing
 
-* Tue Mar 18 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-7
+* Tue Mar 18 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-7
 - Resolves: rhbz#437761 modify to icu.icu6213.worstcase.patch for
   other worst case expansions
 
-* Mon Mar 17 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-6
+* Mon Mar 17 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-6
 - Resolves: rhbz#437761 add icu.icu6213.bengali.worstcase.patch
 
-* Mon Feb 04 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-5
+* Mon Feb 04 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-5
 - Resolves: rhbz#431401 split syllables on 1st 0d4d of a 0d4d + 
   (>= 0d15 && <= 0d39) + 0d4d + 0d30 sequence
 
-* Thu Jan 31 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-4
+* 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 Caolán McNamara <caolanm@redhat.com> - 3.8.1-3
+* 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
   changes
 
-* Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-2
+* Fri Jan 11 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-2
 - remove icu.icu5365.dependantvowels.patch and cleanup
   icu.icu5506.multiplevowels.patch as they patch and unpatch 
   eachother (thanks George Rhoten for pointing out that madness)
 
-* Fri Jan 11 2008 Caolán McNamara <caolanm@redhat.com> - 3.8.1-1
+* Fri Jan 11 2008 Caolan McNamara <caolanm@redhat.com> - 3.8.1-1
 - latest version
 - drop fixed icu.icu6084.zwnj.notdef.patch
 
-* Thu Dec 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-6
+* Thu Dec 13 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-6
 - Resolves: rhbz#423211 experimental hack for 0d15+0d4d+0d30
 
-* Tue Dec 11 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-5
+* Tue Dec 11 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-5
 - Resolves: rhbz#415541 icu.icu6084.zwnj.notdef.patch
 
-* Wed Nov 28 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-4
+* Wed Nov 28 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-4
 - Resolves: ooo#83991 Malayalam "Kartika" font fix
 
-* Tue Nov 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-3
+* Tue Nov 13 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-3
 - add icu.openoffice.org.patch
 
-* Sat Oct 27 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-2
+* Sat Oct 27 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-2
 - add icu.icu6008.arm.padding.patch to fix an arm problem
 
-* Tue Oct 02 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-1
+* Tue Oct 02 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-1
 - latest version
 
-* Mon Sep 03 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-0.2.d02
+* Mon Sep 03 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-0.2.d02
 - next release candidate
 
-* Wed Aug 29 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-0.2.d01
+* Wed Aug 29 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-0.2.d01
 - rebuild
 
-* Tue Aug 07 2007 Caolán McNamara <caolanm@redhat.com> - 3.8-0.1.d01
+* Tue Aug 07 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-0.1.d01
 - 3.8 release candidate
 - drop integrated icu.icu5433.oriya.patch
 - drop integrated icu.icu5488.assamese.patch
@@ -436,53 +298,53 @@ make %{?_smp_mflags} -C source check
 - drop integrated icu.icu5594.gujarati.patch
 - drop integrated icu.icu5465.telegu.patch
 
-* Wed Jun 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-20
+* Wed Jun 13 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-20
 - Resolves: rhbz#243984 change the icu group as it is libicu 
   which is "System Environment/Libraries" not icu
 
-* Mon Apr 30 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-19
+* Mon Apr 30 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-19
 - Resolves: rhbz#220867 Malayalam rendering
 
-* Tue Feb 13 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-18
+* Tue Feb 13 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-18
 - Resolves: rhbz#228457 icu.icu5594.gujarati.patch
 
-* Mon Feb 09 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-17
+* Mon Feb 09 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-17
 - spec cleanups
 
-* Mon Feb 05 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-16
+* Mon Feb 05 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-16
 - Resolves: rhbz#226949 layout telegu like pango
 
-* Fri Jan 19 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-15
+* Fri Jan 19 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-15
 - Resolves: rhbz#214948 icu.icu5506.multiplevowels.patch
 
-* Thu Jan 09 2007 Caolán McNamara <caolanm@redhat.com> - 3.6-14
+* Thu Jan 09 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-14
 - Related: rhbz#216089 add icu.icu5557.safety.patch
 
-* Thu Dec 21 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-13
+* Thu Dec 21 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-13
 - Resolves: rhbz#220433 modify icu.icu5431.malayam.patch
 
-* Fri Nov 10 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-12
+* Fri Nov 10 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-12
 - Resolves: rhbz#214948 icu.icu5506.multiplevowels.patch
 
-* Wed Nov 08 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-11
+* Wed Nov 08 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-11
 - Resolves: rhbz#214555 icu.icu5501.sinhala.biggerexpand.patch
 
-* Wed Nov 08 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-10
+* Wed Nov 08 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-10
 - Resolves: rhbz#214555 icu.icu5500.devicetablecrash.patch
 
-* Thu Oct 18 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-9
+* Thu Oct 18 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-9
 - Resolves: rhbz#213648 extend prev/next to handle ZWJ
 
-* Tue Oct 18 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-8
+* Tue Oct 18 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-8
 - Resolves: rhbz213375 (icu.icu5488.assamese.patch)
 
-* Tue Oct 18 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-7
+* Tue Oct 18 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-7
 - Resolves: rhbz#211258 (icu.icu5465.telegu.patch)
 
-* Thu Oct 05 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-6
+* Thu Oct 05 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-6
 - rh#209391# add icu.icuXXXX.virama.prevnext.patch
 
-* Mon Oct 02 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-5
+* Mon Oct 02 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-5
 - rh#208705# add pkg-config Require for -devel package
 - add icu.icu5431.malayam.patch for rh#208551#/rh#209084#
 - add icu.icu5433.oriya.patch for rh#208559#/rh#209083#
@@ -490,23 +352,23 @@ make %{?_smp_mflags} -C source check
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 3.6-4
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Mon Sep 25 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-3
+* Mon Sep 25 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-3
 - rh#206615# render malayam like pango
 
-* Wed Sep 06 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-2
+* Wed Sep 06 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-2
 - fix rh#205252#/icu#5365 (gnome#121882#/#icu#4026#) to make icu 
   like pango for multiple dependant vowels
 
-* Mon Sep 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-1
+* Mon Sep 03 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-1
 - final release
 
-* Mon Aug 14 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-0.1.d02
+* Mon Aug 14 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-0.1.d02
 - bump
 
-* Tue Aug 08 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-0.2.d01
+* Tue Aug 08 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-0.2.d01
 - c++ code not alias correct
 
-* Mon Jul 31 2006 Caolán McNamara <caolanm@redhat.com> - 3.6-0.1.d01
+* Mon Jul 31 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-0.1.d01
 - rh#200728# update to prelease 3.6d01 to pick up on sinhala fixes
 - drop integrated rh190879.patch
 - drop integrated icu-3.4-sinhala1.patch
@@ -517,16 +379,16 @@ make %{?_smp_mflags} -C source check
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.4-10.1
 - rebuild
 
-* Sat Jun 10 2006 Caolán McNamara <caolanm@redhat.com> - 3.4-10
+* Sat Jun 10 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-10
 - rh#194686# BuildRequires
 
-* Tue May 09 2006 Caolán McNamara <caolanm@redhat.com> - 3.4-9
+* Tue May 09 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-9
 - rh#190879# backport fix
 
-* Wed May 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.4-8
+* Wed May 03 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-8
 - add Harshula's icu-3.4-sinhala1.patch for some Sinhala support
 
-* Tue May 02 2006 Caolán McNamara <caolanm@redhat.com> - 3.4-7
+* Tue May 02 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-7
 - add a pkgconfig.pc, make icu-config use it
 
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.4-6.2
@@ -535,13 +397,13 @@ make %{?_smp_mflags} -C source check
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.4-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Tue Jan 03 2006 Caolán McNamara <caolanm@redhat.com> - 3.4-6
+* Tue Jan 03 2006 Caolan McNamara <caolanm@redhat.com> - 3.4-6
 - add icu-gcc41.patch
 
-* Tue Oct 11 2005 Caolán McNamara <caolanm@redhat.com> - 3.4-5
+* Tue Oct 11 2005 Caolan McNamara <caolanm@redhat.com> - 3.4-5
 - clear execstack requirement for libicudata
 
-* Mon Sep 12 2005 Caolán McNamara <caolanm@redhat.com> - 3.4-4
+* Mon Sep 12 2005 Caolan McNamara <caolanm@redhat.com> - 3.4-4
 - import extra icu.spec into fedora core for openoffice.org
 - build with gcc 4