Remove part of patch for tm (it's correctly in 8.4 directory).

This commit is contained in:
Marcela Mašláňová 2008-02-19 08:13:43 +00:00
parent 63b691f419
commit 16e12b6d01
2 changed files with 3 additions and 21 deletions

View File

@ -1,26 +1,5 @@
--- 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
@@ -783,7 +783,7 @@ install-libraries: libraries $(INSTALL_T
$(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http1.0; \
done;
@echo "Installing package http 2.5.3 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.5.3.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/http-2.5.3.tm;
@echo "Installing library opt0.4 directory";
@for j in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -795,9 +795,9 @@ install-libraries: libraries $(INSTALL_T
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.0.tm;
@echo "Installing package platform 1.0.3 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.3.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/platform-1.0.3.tm;
@echo "Installing package platform::shell 1.1.3 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.3.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/platform/shell-1.1.3.tm;
@echo "Installing library encoding directory";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
@@ -1750,21 +1750,41 @@ allpatch: dist
# tk8.* up two directories from the TOOL_DIR.
#

View File

@ -104,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/tclsh*
%{_datadir}/%{name}%{majorver}
%{_datadir}/%{name}8/%{majorver}/*
%{_datadir}/%{name}8/8.4/*
%{_libdir}/lib%{name}%{majorver}.so
%{_mandir}/man1/*
%{_mandir}/man3/*
@ -123,6 +124,8 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 18 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.1-1
- new version tcl8.5.1
- fix 433151 problem with regular expression
- Version 2.5.3 of the http package requires Tcl 8.4 or better ->
change make patch, add tm files back to 8.4
* Tue Jan 15 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.0-6
- tclsh8.5 is back because of back compatibility #428712