rpms/tcl/devel tcl-8.4.7-path.patch,NONE,1.1 tcl.spec,1.61,1.62

Fri Aug 24 09:47:27 UTC 2007

Author: mmaslano

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

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.4.7-path.patch 
Log Message:
check license & path for 32b/64b fix


tcl-8.4.7-path.patch:

--- NEW FILE tcl-8.4.7-path.patch ---
--- tcl8.4.7/library/init.tcl.patch	2004-05-04 02:40:31.000000000 +0200
+++ tcl8.4.7/library/init.tcl	2007-07-17 09:56:42.000000000 +0200
@@ -39,13 +39,17 @@
 #       On Windows, it is not used
 #	On Macintosh it is "Tool Command Language" in the Extensions folder
 
-if {![info exists auto_path]} {
-    if {[info exists env(TCLLIBPATH)]} {
-	set auto_path $env(TCLLIBPATH)
-    } else {
-	set auto_path ""
-    }
+if {[info exists env(TCLLIBPATH)]} {
+    set auto_path $env(TCLLIBPATH)
+} 
+
+if {[file exists "/usr/lib64/tclX8.3"]} {
+    set auto_path "/usr/share/tcl8.4 /usr/share /usr/lib64 /usr/lib"
+} else {
+    set auto_path ""
 }
+
+
 namespace eval tcl {
     variable Dir
     if {[info library] != ""} {


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- tcl.spec	9 Aug 2007 08:07:35 -0000	1.61
+++ tcl.spec	24 Aug 2007 09:46:53 -0000	1.62
@@ -3,9 +3,9 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1 
-License: BSD
+License: TCL
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
 Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
@@ -15,6 +15,7 @@
 Provides: tcl(abi) = %{majorver}
 ##Conflicts: tcldict
 Patch1: tcl-confi.patch
+Patch2: tcl-8.4.7-path.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -57,6 +58,7 @@
 chmod -x generic/tclThreadAlloc.c
 
 %patch1 -p1 -b .confi
+%patch2 -p1 -b .path
 
 %build
 cd %{name}%{version}/unix
@@ -140,6 +142,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Fri Aug 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-4
+- rebuild for mass rebuild
+- check license & path for 32b/64b fix
+
 * Thu Aug  9 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-3
 - Resolves: rhbz#251410
 


