rpms/tcl/devel tcl-8.5.1-autopath.patch, NONE, 1.1 tcl.spec, 1.72, 1.73 tcl-confi.patch, 1.3, NONE

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7429

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.5.1-autopath.patch 
Removed Files:
	tcl-confi.patch 
Log Message:
- #436567 change auto path, tk can't be found.
- #437399 fix files permission



tcl-8.5.1-autopath.patch:

--- NEW FILE tcl-8.5.1-autopath.patch ---
diff -up tcl8.5.1/unix/configure.in.autopath tcl8.5.1/unix/configure.in
--- tcl8.5.1/unix/configure.in.autopath	2008-02-05 18:00:35.000000000 +0100
+++ tcl8.5.1/unix/configure.in	2008-03-17 14:57:24.000000000 +0100
@@ -795,9 +795,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_MODULE_PATH"  && \
 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
 elif test "$prefix/lib" != "$libdir"; then
-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${libdir}/tk8.5 ${prefix}/lib/tcl8.5 ${prefix}/lib/tk8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
 else
-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${TCL_PACKAGE_PATH}"
 fi
 
 #--------------------------------------------------------------------
diff -up tcl8.5.1/library/init.tcl.autopath tcl8.5.1/library/init.tcl
--- tcl8.5.1/library/init.tcl.autopath	2008-02-04 18:29:11.000000000 +0100
+++ tcl8.5.1/library/init.tcl	2008-02-19 09:11:51.000000000 +0100
@@ -48,16 +48,11 @@ if {![info exists auto_path]} {
 }
 namespace eval tcl {
     variable Dir
-    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
+    foreach Dir [list $::tcl_library] {
 	if {$Dir ni $::auto_path} {
 	    lappend ::auto_path $Dir
 	}
     }
-    set Dir [file join [file dirname [file dirname \
-	    [info nameofexecutable]]] lib]
-    if {$Dir ni $::auto_path} {
-	lappend ::auto_path $Dir
-    }
     catch {
 	foreach Dir $::tcl_pkgPath {
 	    if {$Dir ni $::auto_path} {
diff -up tcl8.5.1/library/auto.tcl.autopath tcl8.5.1/library/auto.tcl
--- tcl8.5.1/library/auto.tcl.autopath	2006-11-03 01:34:52.000000000 +0100
+++ tcl8.5.1/library/auto.tcl	2008-02-19 09:11:51.000000000 +0100
@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
 	    lappend dirs $value
 	}
 
+        # 2a. As a sibling of Tcl's script directory
+        if {[catch {
+            ::tcl::pkgconfig get scriptdir,runtime
+        } value] == 0} {
+            lappend dirs [file join [file dirname $value] $basename$version]
+        }
+
 	# 3. Relative to auto_path directories.  This checks relative to the
 	# Tcl library as well as allowing loading of libraries added to the
 	# auto_path that is not relative to the core library or binary paths.


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tcl.spec	19 Feb 2008 14:33:53 -0000	1.72
+++ tcl.spec	17 Mar 2008 14:42:59 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: TCL
 Group: Development/Languages
@@ -14,7 +14,7 @@
 Provides: tcl(abi) = %{majorver}
 Obsoletes: tcl-tcldict <= 8.5.2
 Provides: tcl-tcldict = 8.5.2
-Patch0: tcl-8.5.0-autopath.patch
+Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
 Patch2: tcl-8.5.0-make.patch
 Patch3: tcl-8.5.0-hidden.patch
@@ -121,6 +121,10 @@
 %{_libdir}/%{name}Config.sh
 
 %changelog
+* Mon Mar 17 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.1-3
+- #436567 change auto path, tk can't be found.
+- #437399 fix files permission
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:8.5.1-2
 - Autorebuild for GCC 4.3
 


--- tcl-confi.patch DELETED ---