From 1488f4fda7fb2f1c4a857ccc92910efdbeb3795f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Tue, 3 Apr 2007 13:17:09 +0000
Subject: [PATCH] Rebuil, clean spec.

---
 tcl.spec | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/tcl.spec b/tcl.spec
index 6fa94e8..f005a17 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1 
 License: BSD
 Group: Development/Languages
@@ -74,6 +74,7 @@ popd
 %patch7 -p1 -b .7-tests
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
+# patch7 change placement of tests (merge review)
 
 %build
 cd %{name}%{version}/unix
@@ -97,19 +98,10 @@ make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{_datadir}/%{name
 
 ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
 
-# for linking with -l%{name}
+# for linking with -lib%{name}
 ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
 
-# backward compatible symlink for legacy tcl packages that hardcode lib path
-# to prefix/lib/%{name}%{majorver}
-## make /usr/lib for multilib archs
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib
-#mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-#ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_prefix}/lib/%{name}%{majorver}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
-#cp -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
-cp -Rp $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ $RPM_BUILD_ROOT/%{_libdir}/
+ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix}
 find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
@@ -139,8 +131,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/mann/*
-# this should be prefix/lib
-#%{_prefix}/lib/%{name}%{majorver}
 %{_libdir}/%{name}%{majorver}
 %doc %{name}%{version}/README %{name}%{version}/changes 
 %doc %{name}%{version}/license.terms
@@ -158,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{name}%{version}/html/*
 
 %changelog
+* Tue Apr  3 2007 Marcela Maslanova <mmaslano@redhat.com> - 1:8.4.13-15
+- cleaning spec
+
 * Tue Mar 21 2007 Marcela Maslanova <mmaslano@redhat.com> - 1:8.4.13-14
 - multilib problem, rhbz#227200