rpms/icu/devel icu.spec,1.93,1.94

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3815

Modified Files:
	icu.spec 
Log Message:
Resolves: rhbz#508288 multilib conflict


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- icu.spec	11 Jun 2009 10:37:21 -0000	1.93
+++ icu.spec	26 Jun 2009 13:53:49 -0000	1.94
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.0.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -79,8 +79,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindi
 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
-mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/Makefile.inc $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -124,9 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/unicode
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/icu.pc
+%{_libdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{version}
-%{_datadir}/%{name}/%{version}/Makefile.inc
 %{_datadir}/%{name}/%{version}/install-sh
 %{_datadir}/%{name}/%{version}/mkinstalldirs
 %{_datadir}/%{name}/%{version}/config
@@ -137,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Fri Jun 26 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.0.1-3
+- Resolves: rhbz#508288 multilib conflict
+
 * Thu Jun 11 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.0.1-2
 - Resolves: rhbz#505252 add icu.6995.kannada.patch