From d581faf94b3ece43009b6ebceaf817bb7dfe10b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 24 Aug 2007 09:46:53 +0000 Subject: [PATCH] check license & path for 32b/64b fix --- tcl-8.4.7-path.patch | 26 ++++++++++++++++++++++++++ tcl.spec | 10 ++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 tcl-8.4.7-path.patch diff --git a/tcl-8.4.7-path.patch b/tcl-8.4.7-path.patch new file mode 100644 index 0000000..999bbf8 --- /dev/null +++ b/tcl-8.4.7-path.patch @@ -0,0 +1,26 @@ +--- 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] != ""} { diff --git a/tcl.spec b/tcl.spec index f1bfa0c..c818849 100644 --- a/tcl.spec +++ b/tcl.spec @@ -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 @@ Buildrequires: autoconf 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 @@ cd %{name}%{version} chmod -x generic/tclThreadAlloc.c %patch1 -p1 -b .confi +%patch2 -p1 -b .path %build cd %{name}%{version}/unix @@ -140,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{name}%{version}/html/* %changelog +* Fri Aug 24 2007 Marcela Maslanova - 1:8.4.15-4 +- rebuild for mass rebuild +- check license & path for 32b/64b fix + * Thu Aug 9 2007 Marcela Maslanova - 1:8.4.15-3 - Resolves: rhbz#251410