[icu] bump to 4.6

[Caolan McNamara]

commit 208fe99d896a2739461b53057f1456035a680a25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 7 10:55:22 2011 +0000

    bump to 4.6

 .gitignore                       |    3 +-
 icu.6995.kannada.patch           |   11 ---------
 icu.7932.doublecompare.patch     |   14 -----------
 icu.7971.buildfix.patch          |   11 ---------
 icu.7972.buildfix.patch          |   14 -----------
 icu.8011.buildfix.patch          |   11 ---------
 icu.rhbz681941.extralinklm.patch |   19 ++++++++++++++++
 icu.spec                         |   45 ++++++++++++++++---------------------
 sources                          |    3 +-
 9 files changed, 41 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d2fb72..39d69f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-icu4c-4_4_2-src.tgz
-/icu-config
+/icu4c-4_6-src.tgz
diff --git a/icu.rhbz681941.extralinklm.patch b/icu.rhbz681941.extralinklm.patch
new file mode 100644
index 0000000..2af24fd
--- /dev/null
+++ b/icu.rhbz681941.extralinklm.patch
@@ -0,0 +1,19 @@
+--- icu/source/configure.in	2011-03-07 09:39:32.223725803 +0000
++++ icu/source/configure.in	2011-03-07 09:42:46.482876656 +0000
+@@ -214,15 +214,7 @@
+ # Determine the Makefile fragment
+ ICU_CHECK_MH_FRAG
+ 
+-# Checks for libraries and other host specific stuff
+-# On HP/UX, don't link to -lm from a shared lib because it isn't
+-#  PIC (at least on 10.2)
+-case "${host}" in
+-	*-*-hpux*) 	AC_CHECK_LIB(m, floor, LIB_M="-lm") ;;
+-	
+-	*) 		AC_CHECK_LIB(m, floor) 
+-			LIB_M="" ;;
+-esac
++AC_CHECK_LIB(m, floor, LIB_M="-lm")
+ AC_SUBST(LIB_M)
+ 
+ # Check whether to build shared libraries
diff --git a/icu.spec b/icu.spec
index 0bd537b..4353f4b 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,24 +1,18 @@
 Name:      icu
-Version:   4.4.2
-Release:   8%{?dist}
+Version:   4.6
+Release:   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/4.4.2/icu4c-4_4_2-src.tgz
-Source1:   icu-config
+Source:    http://download.icu-project.org/files/icu4c/4.6/icu4c-4_6-src.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, autoconf
 Requires: lib%{name} = %{version}-%{release}
 
-Patch1: icu-3.4-multiarchdevel.patch
-Patch2: icu.6995.kannada.patch
-Patch3: icu.7971.buildfix.patch
-Patch4: icu.7972.buildfix.patch
-Patch5: icu.7932.doublecompare.patch
-Patch6: icu.8011.buildfix.patch
-Patch7: icu.8198.revert.icu5431.patch
-Patch8: icu.8320.freeserif.crash.patch
+Patch1: icu.8198.revert.icu5431.patch
+Patch2: icu.8320.freeserif.crash.patch
+Patch3: icu.rhbz681941.extralinklm.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -58,14 +52,9 @@ BuildArch: noarch
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1 -b .multiarchdevel
-%patch2 -p1 -b .icu6995.kannada.patch
-%patch3 -p1 -b .icu7971.buildfix.patch
-%patch4 -p1 -b .icu7972.buildfix.patch
-%patch5 -p1 -b .icu7932.doublecompare.patch
-%patch6 -p1 -b .icu8011.buildfix.patch
-%patch7 -p2 -R -b .icu8198.revert.icu5431.patch
-%patch8 -p1 -b .icu8320.freeserif.crash.patch
+%patch1 -p2 -R -b .icu8198.revert.icu5431.patch
+%patch2 -p1 -b .icu8320.freeserif.crash.patch
+%patch3 -p1 -b .rhbz681941.extralinklm.patch
 
 %build
 cd source
@@ -82,11 +71,7 @@ make doc
 rm -rf $RPM_BUILD_ROOT source/__docs
 make -C source install DESTDIR=$RPM_BUILD_ROOT
 make -C source install-doc docdir=__docs
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
-chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
 chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-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
 make -C source check
@@ -133,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/layout
 %{_includedir}/unicode
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/icu.pc
+%{_libdir}/pkgconfig/*.pc
 %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{version}
@@ -148,6 +133,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Mon Mar 07 2011 Caolán McNamara <caolanm at 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
+- Resolves: rhbz#681941 don't link unneccessary -lm
+
 * Fri Feb 11 2011 Caolán McNamara <caolanm at redhat.com> - 4.4.2-8
 - Resolves: rhbz#674328 yet more ways that freeserif crashes libicu
 
diff --git a/sources b/sources
index f4ef731..c2b676c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-314e582264c36b3735466c522899aa07  icu4c-4_4_2-src.tgz
-65e5e6918fc40b04177a5a95d83cfc7c  icu-config
+43e56b71c407be5154de681eaa646a4a  icu4c-4_6-src.tgz