Merge remote-tracking branch 'origin/f19' into f20

Conflicts:
	icu.spec

icu.spec

@@ -1,6 +1,6 @@
 Name:      icu
 Version:   50.1.2
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
@@ -11,7 +11,7 @@ Source0:   http://download.icu-project.org/files/icu4c/50.1.2/icu4c-50_1_2-src.t
 Source1:   http://download.icu-project.org/files/icu4c/51.1/icu-51-layout-fix-10107.tgz
 Source2:   icu-config.sh
 BuildRequires: doxygen, autoconf, python
-Requires: lib%{name} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 Patch1: icu.8198.revert.icu5431.patch
 Patch2: icu.8800.freeserif.crash.patch
@@ -43,7 +43,7 @@ customize the supplied services.
 %package  -n lib%{name}-devel
 Summary:  Development files for International Components for Unicode
 Group:    Development/Libraries
-Requires: lib%{name} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description -n lib%{name}-devel
@@ -177,6 +177,9 @@ make %{?_smp_mflags} -C source check
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Fri Oct 04 2013 Eike Rathke <erack@redhat.com> - 50.1.2-9
+- added %{?_isa} to Requires for multi-arch systems
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50.1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild