rpms/icu/F-11 icu.spec,1.89,1.90
Caolan McNamara
caolanm at fedoraproject.org
Sat Jun 27 08:50:03 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/icu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26966/F-11
Modified Files:
icu.spec
Log Message:
Resolves: rhbz#508288 multilib conflict
Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/F-11/icu.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- icu.spec 11 Jun 2009 10:40:32 -0000 1.89
+++ icu.spec 27 Jun 2009 08:49:33 -0000 1.90
@@ -1,6 +1,6 @@
Name: icu
Version: 4.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: International Components for Unicode
Group: Development/Tools
License: MIT
@@ -82,8 +82,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
@@ -126,9 +124,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
@@ -139,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%doc source/__docs/%{name}/html/*
%changelog
+* Sat Jun 27 2009 Caolan McNamara <caolanm at redhat.com> - 4.0.1-5
+- Resolves: rhbz#508288 multilib conflict
+
* Thu Jun 11 2009 Caolan McNamara <caolanm at redhat.com> - 4.0.1-4
- Resolves: rhbz#505252 add icu.6995.kannada.patch
More information about the fedora-extras-commits
mailing list