rpms/tcl/devel tcl-8.5.0-make.patch,1.2,1.3 tcl.spec,1.70,1.71

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

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

Modified Files:
	tcl-8.5.0-make.patch tcl.spec 
Log Message:
Remove part of patch for tm (it's correctly in 8.4 directory).


tcl-8.5.0-make.patch:

Index: tcl-8.5.0-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl-8.5.0-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-8.5.0-make.patch	15 Jan 2008 13:54:25 -0000	1.2
+++ tcl-8.5.0-make.patch	19 Feb 2008 08:13:43 -0000	1.3
@@ -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.
  #


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tcl.spec	18 Feb 2008 08:10:19 -0000	1.70
+++ tcl.spec	19 Feb 2008 08:13:43 -0000	1.71
@@ -104,6 +104,7 @@
 %{_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 @@
 * Mon Jan 18 2008 Marcela Maslanova <mmaslano at 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 at redhat.com> - 1:8.5.0-6
 - tclsh8.5 is back because of back compatibility #428712