--- a/icu/icu.spec Mon May 02 14:39:03 2011 +0200
+++ b/icu/icu.spec Fri May 06 10:42:45 2011 +0200
@@ -161,7 +161,6 @@
make install DESTDIR=$RPM_BUILD_ROOT
cd $RPM_BUILD_DIR/%{src_name}-%{version}
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/icu/4
%ifarch amd64 sparcv9
cd %{src_name}-64
@@ -170,14 +169,17 @@
%endif
find ${RPM_BUILD_ROOT} -name "*.a" -exec rm -rf {} \; -print
-find ${RPM_BUILD_ROOT} -name "icudt401" -exec rm -rf {} \; -print
rm -rf ${RPM_BUILD_ROOT}/usr/lib/icu/current
-rm -rf ${RPM_BUILD_ROOT}/usr/lib/icu/Makefile.inc
+rm -f ${RPM_BUILD_ROOT}/usr/lib/icu/Makefile.inc
+rm -f ${RPM_BUILD_ROOT}/usr/lib/icu/pkgdata.inc
rm -rf ${RPM_BUILD_ROOT}/usr/amd64
rm -rf ${RPM_BUILD_ROOT}/usr/sparcv9
rm -rf ${RPM_BUILD_ROOT}/usr/lib/amd64/icu
rm -rf ${RPM_BUILD_ROOT}/usr/lib/sparcv9/icu
rm -rf ${RPM_BUILD_ROOT}/usr/share/icu
+mv ${RPM_BUILD_ROOT}/usr/lib/icu/4.6/pkgdata.inc ${RPM_BUILD_ROOT}/usr/lib/icu
+mv ${RPM_BUILD_ROOT}/usr/lib/icu/4.6/Makefile.inc ${RPM_BUILD_ROOT}/usr/lib/icu
+rm -rf ${RPM_BUILD_ROOT}/usr/lib/icu/4.6
mkdir ${RPM_BUILD_ROOT}/usr/share/man/man1m
mv ${RPM_BUILD_ROOT}/usr/share/man/man8/genccode.8 ${RPM_BUILD_ROOT}/usr/share/man/man1m/genccode.1m
@@ -200,7 +202,6 @@
%defattr(-, root, bin)
%dir %attr (0755, root, bin) %{_libdir}/lib*.so*
%dir %attr (0755, root, bin) %{_libdir}/icu
-%dir %attr (0755, root, bin) %{_libdir}/icu/4
%ifarch amd64 sparcv9
%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}/lib*.so*
@@ -211,8 +212,7 @@
%dir %attr (0755, root, bin) /usr/include/unicode/*.h
%dir %attr (0755, root, bin) /usr/include/layout/*.h
%dir %attr (0755, root, bin) %{_libdir}/icu/pkgdata.inc
-%dir %attr (0755, root, bin) %{_libdir}/icu/%{majorminor}/pkgdata.inc
-%dir %attr (0755, root, bin) %{_libdir}/icu/%{majorminor}/Makefile.inc
+%dir %attr (0755, root, bin) %{_libdir}/icu/Makefile.inc
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-le.pc
@@ -291,6 +291,8 @@
%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicuuc.3lib
%changelog
+* Fri May 6 2011 Pavel Heimlich <[email protected]>
+- fix CR 7038520 - broken symlink
* Mon May 2 2011 Pavel Heimlich <[email protected]>
- fix CR 7035907
- EOF ICU2 and ICU 3