Resolves: rhbz#508288 multilib conflict

This commit is contained in:
Caolan McNamara 2009-06-26 13:53:49 +00:00
parent 7d75c27abf
commit 5d5263f31b

View File

@ -1,6 +1,6 @@
Name: icu Name: icu
Version: 4.2.0.1 Version: 4.2.0.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: International Components for Unicode Summary: International Components for Unicode
Group: Development/Tools Group: Development/Tools
License: MIT License: MIT
@ -79,8 +79,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -124,9 +122,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/unicode %{_includedir}/unicode
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/icu.pc %{_libdir}/pkgconfig/icu.pc
%{_libdir}/%{name}
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/%{version} %dir %{_datadir}/%{name}/%{version}
%{_datadir}/%{name}/%{version}/Makefile.inc
%{_datadir}/%{name}/%{version}/install-sh %{_datadir}/%{name}/%{version}/install-sh
%{_datadir}/%{name}/%{version}/mkinstalldirs %{_datadir}/%{name}/%{version}/mkinstalldirs
%{_datadir}/%{name}/%{version}/config %{_datadir}/%{name}/%{version}/config
@ -137,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%doc source/__docs/%{name}/html/* %doc source/__docs/%{name}/html/*
%changelog %changelog
* Fri Jun 26 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-3
- Resolves: rhbz#508288 multilib conflict
* Thu Jun 11 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-2 * Thu Jun 11 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.0.1-2
- Resolves: rhbz#505252 add icu.6995.kannada.patch - Resolves: rhbz#505252 add icu.6995.kannada.patch