[icu/f17] Resolves: rhbz#804313 multi-lib pain

[Caolán McNamara]

commit 61b6582f08eedd2ca8dc88371fa180cdd58db546
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 15 14:48:39 2012 +0100

    Resolves: rhbz#804313 multi-lib pain

 .gitignore |    1 +
 icu.spec   |   15 ++++++++++++---
 sources    |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4a7079..43f037b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /icu4c-4*-src.tgz
+/icu-config.sh
diff --git a/icu.spec b/icu.spec
index 39a2b82..025fb3a 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,11 +1,12 @@
 Name:      icu
 Version:   4.8.1.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
 URL:       http://www.icu-project.org/
-Source:    http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
+Source0:   http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
+Source1:   icu-config.sh
 BuildRequires: doxygen, autoconf
 Requires: lib%{name} = %{version}-%{release}
 
@@ -84,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT source/__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
 
 %check
 make -C source check
@@ -121,7 +127,7 @@ make -C source check
 
 %files -n lib%{name}-devel
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-config
+%{_bindir}/%{name}-config*
 %{_bindir}/icuinfo
 %{_mandir}/man1/%{name}-config.1*
 %{_includedir}/layout
@@ -142,6 +148,9 @@ make -C source check
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Fri Jun 15 2012 Caolán McNamara <caolanm at redhat.com> - 4.8.1.1-4
+- Resolves: rhbz#804313 multi-lib pain
+
 * Thu Apr 19 2012 Eike Rathke <erack at redhat.com> - 4.8.1.1-3
 - Resolves: rhbz#813484 doxygen 1.8.0 does not provide installdox, omit from install
 
diff --git a/sources b/sources
index f6ccab5..493aef1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 ea93970a0275be6b42f56953cd332c17  icu4c-4_8_1_1-src.tgz
+d28e7ab76e0f77044153f3bfd18880c2  icu-config.sh