From 91ee317d7199c82c8b8534f4bc1c052d01032a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 15 Jun 2012 14:50:54 +0100
Subject: [PATCH] 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 9ad6bd6..4414c6b 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,11 +1,12 @@
 Name:      icu
 Version:   49.1.1
-Release:   1%{?dist}
+Release:   2%{?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/49.1.1/icu4c-49_1_1-src.tgz
+Source0:   http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_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@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
 
diff --git a/sources b/sources
index e5aee89..bf34af4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7c53f83e0327343f4060c0eb83842daf  icu4c-49_1_1-src.tgz
+d28e7ab76e0f77044153f3bfd18880c2  icu-config.sh