rpms/tcl/devel tcl-8.5a5-makefile.patch,1.1,1.2 tcl.spec,1.35,1.36

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv912

Modified Files:
	tcl-8.5a5-makefile.patch tcl.spec 
Log Message:
Add patch


tcl-8.5a5-makefile.patch:
 Makefile.in |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

Index: tcl-8.5a5-makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl-8.5a5-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-8.5a5-makefile.patch	25 Jan 2007 09:31:32 -0000	1.1
+++ tcl-8.5a5-makefile.patch	25 Jan 2007 10:51:38 -0000	1.2
@@ -1,19 +1,24 @@
---- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch	2007-01-25 09:20:35.000000000 +0100
-+++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in	2007-01-25 09:56:42.000000000 +0100
-@@ -813,12 +813,10 @@
+--- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch	2006-10-23 15:41:32.000000000 +0200
++++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in	2007-01-25 11:42:56.000000000 +0100
+@@ -813,17 +813,13 @@
  
  install-tzdata:
  	@echo "Installing time zone data"
--	@echo "Creating tzdata";                                                                                              
--	cp -R $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata
--##	@@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)/installData.tcl \
--##	    $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata
-+	@@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)/installData.tcl \
-+	    $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata
+-	@@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)/installData.tcl \
+-	    $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata
++	mkdir -p $(SCRIPT_INSTALL_DIR)
++	cp -R $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata
  
  install-msgs:
  	@echo "Installing message catalogs"
+-	@@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)/installData.tcl \
+-	    $(TOP_DIR)/library/msgs $(SCRIPT_INSTALL_DIR)/msgs
++	mkdir -p $(SCRIPT_INSTALL_DIR)
++	cp -R $(TOP_DIR)/library/msgs $(SCRIPT_INSTALL_DIR)/msgs
+ 
+ install-doc: doc
+ 	@if test ! -x $(UNIX_DIR)/installManPage; then \


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tcl.spec	25 Jan 2007 09:31:32 -0000	1.35
+++ tcl.spec	25 Jan 2007 10:51:38 -0000	1.36
@@ -72,8 +72,8 @@
 #%patch5 -p1 -b .5-ac213
 pushd ..
 %patch6 -p1 -b .6-cflags
-popd
 %patch7 -p1 -b .7-makefile
+popd
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix