- move pkgIndex.tcl back into %{_libdir}/%{name}%{majorver} so that

multilib parallel installs works (135310)
- drop tk-8.4.5-pkgIndex-loc.patch
- remove any compat symlink present before installing
- do not generate compat symlink after installing

tk.spec

@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.7
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -19,7 +19,6 @@ Patch1: tk-8.3.5-tclm4-soname.patch
 Patch2: tk-8.4.4-lib-perm.patch
 Patch3: tk-8.4-no_rpath.patch
 Patch4: tk-8.4-autoconf.patch
-Patch5: tk-8.4.5-pkgIndex-loc.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -46,7 +45,6 @@ The package contains the development files and man pages for tk.
 %patch2 -p1 -b .rolib
 %patch3 -p1 -b .no_rpath
 %patch4 -p1 -b .ac213
-%patch5 -p1 -b .pkgIdx
 
 # patch1 touches tcl.m4
 cd unix
@@ -89,13 +87,12 @@ perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %b
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+[ ! -h %{_prefix}/lib/%{name}%{majorver} ] || rm %{_prefix}/lib/%{name}%{majorver}
+
 %post
 /sbin/ldconfig
 
-# try to make a backward compatible symlink for legacy tk packages
-# that hardcode lib path to prefix/lib/%{name}%{majorver}
-[ -d %{_prefix}/lib/%{name}%{majorver} ] || ln -s %{_datadir}/%{name}%{majorver} %{_prefix}/lib/%{name}%{majorver}
-
 %postun
 /sbin/ldconfig
 
@@ -105,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}%{majorver}
 %{_libdir}/lib%{name}%{majorver}.so
 %{_libdir}/%{name}Config.sh
+%{_libdir}/%{name}%{majorver}
 %{_mandir}/man1/*
 %doc README changes license.terms
 
@@ -117,6 +115,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/mann/*
 
 %changelog
+* Fri Oct 15 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-2
+- move pkgIndex.tcl back into %{_libdir}/%{name}%{majorver} so that multilib
+  parallel installs works (135310)
+  - drop tk-8.4.5-pkgIndex-loc.patch
+  - remove any compat symlink present before installing
+  - do not generate compat symlink after installing
+
 * Fri Jul 30 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-1
 - update to 8.4.7
   - replace tk-8.4.5-no_rpath.patch with tk-8.4-no_rpath.patch