Update tcl to 8.5.2 and remove useless patch for makefile (html

documentation is in separeta package).
This commit is contained in:
Marcela Mašláňová 2008-05-19 12:41:11 +00:00
parent c89ecb482c
commit 6a3f6b6c2c
4 changed files with 6 additions and 65 deletions

View File

@ -1 +1 @@
tcl8.5.1-src.tar.gz
tcl8.5.2-src.tar.gz

View File

@ -1 +1 @@
1b5f9a043f53c5828dcde3684e3264d5 tcl8.5.1-src.tar.gz
2eeff7a61844b3e6de5202da1275cff1 tcl8.5.2-src.tar.gz

View File

@ -1,59 +0,0 @@
--- tcl8.5.0/unix/Makefile.in.make 2007-12-19 22:50:13.000000000 +0100
+++ tcl8.5.0/unix/Makefile.in 2007-12-20 11:11:07.000000000 +0100
@@ -1750,21 +1750,41 @@ allpatch: dist
# tk8.* up two directories from the TOOL_DIR.
#
-html: tclsh
- $(BUILD_HTML)
- @EXTRA_BUILD_HTML@
-html-tcl: tclsh
- $(BUILD_HTML) --tcl
- @EXTRA_BUILD_HTML@
-html-tk: tclsh
- $(BUILD_HTML) --tk
- @EXTRA_BUILD_HTML@
-
-BUILD_HTML = \
- @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
- --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+html:
+ echo "Building html" \
+ echo "adresar $(HTML_DIR)"; \
+ mkdir -p ../htmll; \
+ mkdir -p ../html; \
+ mkdir -p ../html/TclCmd;
+ mkdir -p ../html/TclLib;
+ mkdir -p ../html/TkCmd;
+ mkdir -p ../html/TkLib;
+ mkdir -p ../html/UserCmd;
+ cd ..; \
+ for i in `ls doc`; do \
+ j=`echo $$i | sed s/[0-9n]$$/htm/`; \
+ man2html doc/$$i > htmll/$$j 2> /dev/null ; \
+ done;
+ for i in `ls ../../tk8.5b1/doc`; do \
+ j=`echo $$i | sed s/[0-9n]$$/htm/`; \
+ man2html ../../tk8.5b1/doc/$$i > ../htmll/$$j 2> /dev/null; \
+ done;
+ for i in `cat lst/tclcmd_list`; do \
+ cp ../htmll/$$i ../html/TclCmd/$$i; \
+ done;
+ for i in `cat lst/tcllib_list`; do \
+ cp ../htmll/$$i ../html/TclLib/$$i; \
+ done;
+ for i in `cat lst/tkcmd_list`; do \
+ cp ../htmll/$$i ../html/TkCmd/$$i; \
+ done;
+ for i in `cat lst/tklib_list`; do \
+ cp ../htmll/$$i ../html/TkLib/$$i; \
+ done;
+ for i in `cat lst/usercmd_list`; do \
+ cp ../htmll/$$i ../html/UserCmd/$$i; \
+ done;
+ rm -r ../htmll;
#
# Targets to build Solaris package of the distribution for the current

View File

@ -2,8 +2,8 @@
Summary: Tcl scripting language development environment
Name: tcl
Version: %{majorver}.1
Release: 4%{?dist}
Version: %{majorver}.2
Release: 1%{?dist}
Epoch: 1
License: TCL
Group: Development/Languages
@ -16,7 +16,7 @@ Obsoletes: tcl-tcldict <= 8.5.2
Provides: tcl-tcldict = 8.5.2
Patch0: tcl-8.5.1-autopath.patch
Patch1: tcl-8.5.0-conf.patch
Patch2: tcl-8.5.0-make.patch
Patch2: tcl-8.5.2-makefile.patch
Patch3: tcl-8.5.0-hidden.patch
%description
@ -50,7 +50,7 @@ chmod -x generic/tclThreadAlloc.c
%patch0 -p1 -b .autopath
%patch1 -p1 -b .conf
%patch2 -p1 -b .make
#%patch2 -p1 -b .make
%patch3 -p1 -b .hidden
%build