diff --git a/tcl-8.5.0-autopath.patch b/tcl-8.5.0-autopath.patch deleted file mode 100644 index 249de70..0000000 --- a/tcl-8.5.0-autopath.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- tcl8.5.0/unix/configure.in.orig 2007-12-19 13:50:13.000000000 -0800 -+++ tcl8.5.0/unix/configure.in 2007-12-21 19:25:04.000000000 -0800 -@@ -795,9 +795,9 @@ - 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 ${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 ${TCL_PACKAGE_PATH}" - fi - - #-------------------------------------------------------------------- ---- tcl8.5.0/library/init.tcl.orig 2007-12-21 19:43:12.000000000 -0800 -+++ tcl8.5.0/library/init.tcl 2007-12-21 19:43:28.000000000 -0800 -@@ -48,16 +48,11 @@ - } - 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} { ---- tcl8.5a5/library/auto.tcl.orig 2007-02-08 17:03:44.000000000 -0800 -+++ tcl8.5a5/library/auto.tcl 2007-02-08 17:04:03.000000000 -0800 -@@ -85,6 +85,13 @@ - 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. diff --git a/tcl-8.5.6-http.pach b/tcl-8.5.6-http.pach deleted file mode 100644 index 59d41c3..0000000 --- a/tcl-8.5.6-http.pach +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tcl8.5.6/library/http/http.tcl.old tcl8.5.6/library/http/http.tcl ---- tcl8.5.6/library/http/http.tcl.old 2008-10-24 01:34:32.000000000 +0200 -+++ tcl8.5.6/library/http/http.tcl 2009-03-31 09:19:44.000000000 +0200 -@@ -946,6 +946,8 @@ proc http::Event {sock token} { - set state(state) "header" - if {[catch {gets $sock state(http)} n]} { - return [Finish $token $n] -+ } elseif {$n >= 0} { -+ set state(state) "header" - } - } elseif {$state(state) eq "header"} { - if {[catch {gets $sock line} n]} { diff --git a/tcl-8.5.6-http.patch b/tcl-8.5.6-http.patch deleted file mode 100644 index 97cfff2..0000000 --- a/tcl-8.5.6-http.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tcl8.5.6/library/http/http.tcl.http tcl8.5.6/library/http/http.tcl ---- tcl8.5.6/library/http/http.tcl.http 2008-10-24 01:34:32.000000000 +0200 -+++ tcl8.5.6/library/http/http.tcl 2009-04-01 08:01:54.000000000 +0200 -@@ -943,9 +943,10 @@ proc http::Event {sock token} { - return - } - if {$state(state) eq "connecting"} { -- set state(state) "header" - if {[catch {gets $sock state(http)} n]} { - return [Finish $token $n] -+ } elseif {$n >= 0} { -+ set state(state) "header" - } - } elseif {$state(state) eq "header"} { - if {[catch {gets $sock line} n]} { diff --git a/tcl.spec b/tcl.spec index e313f1a..24b2961 100644 --- a/tcl.spec +++ b/tcl.spec @@ -60,11 +60,12 @@ chmod -x generic/tclThreadAlloc.c %build pushd unix autoconf -%configure \ +%configure \ %if %sdt --enable-dtrace \ %endif --disable-threads + make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver} %check