rpms/tcl/devel tcl-8.5a5-no_rpath.patch, NONE, 1.1 tcl-8.5a5-tclm4-soname.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 tcl.spec, 1.28, 1.29 tcl-8.3.5-tclm4-soname.patch, 1.1, NONE tcl-8.4-no_rpath.patch, 1.1, NONE

Tue Dec 19 13:43:00 UTC 2006

Author: mmaslano

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

Modified Files:
	.cvsignore sources tcl.spec 
Added Files:
	tcl-8.5a5-no_rpath.patch tcl-8.5a5-tclm4-soname.patch 
Removed Files:
	tcl-8.3.5-tclm4-soname.patch tcl-8.4-no_rpath.patch 
Log Message:
Replace patches.


tcl-8.5a5-no_rpath.patch:
 tcl.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tcl-8.5a5-no_rpath.patch ---
--- tcl8.5a5/unix/tcl.m4.4-rpath	2006-12-19 10:47:46.000000000 +0100
+++ tcl8.5a5/unix/tcl.m4	2006-12-19 10:52:47.000000000 +0100
@@ -1405,7 +1405,7 @@
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    CC_SEARCH_FLAGS=''
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 	    if test "`uname -m`" = "alpha" ; then
 		CFLAGS="$CFLAGS -mieee"

tcl-8.5a5-tclm4-soname.patch:
 tcl.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tcl-8.5a5-tclm4-soname.patch ---
--- tcl8.5a5/unix/tcl.m4.soname	2006-10-23 15:41:32.000000000 +0200
+++ tcl8.5a5/unix/tcl.m4	2006-12-19 10:45:56.000000000 +0100
@@ -1401,7 +1401,7 @@
 	    # get rid of the warnings.
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
-	    SHLIB_LD="${CC} -shared"
+	    SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Dec 2006 15:46:21 -0000	1.11
+++ .cvsignore	19 Dec 2006 13:42:58 -0000	1.12
@@ -1 +1,2 @@
 tcl8.5a5-src.tar.gz
+tk8.5a5-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Dec 2006 16:49:56 -0000	1.12
+++ sources	19 Dec 2006 13:42:58 -0000	1.13
@@ -1 +1,2 @@
 fe9e399c1f186f8c605de8d2e262881e  tcl8.5a5-src.tar.gz
+8118677251db51faf49bb3333ed6db16  tk8.5a5-src.tar.gz


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tcl.spec	18 Dec 2006 16:49:56 -0000	1.28
+++ tcl.spec	19 Dec 2006 13:42:58 -0000	1.29
@@ -10,15 +10,15 @@
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
 Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
-#Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
+Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires: autoconf, sed
-Patch1: tcl-8.3.5-tclm4-soname.patch
+Patch1: tcl-8.5a5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
-Patch4: tcl-8.4-no_rpath.patch
+Patch4: tcl-8.5a5-no_rpath.patch
 #Patch5: tcl-8.4.13-autoconf.patch
-Patch6: tcl-8.4.13-cflags.patch
+#Patch6: tcl-8.4.13-cflags.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -58,34 +58,34 @@
 
 This package contains the html manual.
 
-prep
+%prep
 %setup -T -D -c %{name}-%{version} -q -a 0 
 ##-a 1 
-ls
 cd %{name}%{version}
 
 # define DT SONAME in shared lib
-%patch1 -p1 -b .1-soname
+%patch1 -p1 -b .soname
 #%patch2 -p1 -b .2-ro-lib
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 #%patch5 -p1 -b .5-ac213
-pushd ..
-%patch6 -p1 -b .6-cflags
-popd
+#pushd ..
+#%patch6 -p1 -b .6-cflags
+#popd
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
 autoconf
 
 %build
+ls %{_tmppath}
 cd %{name}%{version}/unix
 %configure --enable-threads
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
-# run "make test" by default
-%{?_without_check: %define _without_check 1}
-%{!?_without_check: %define _without_check 0}
+# don't run "make test" by default
+%{?_without_check: %define _without_check 0}
+%{!?_without_check: %define _without_check 1}
 
 %if ! %{_without_check}
   make test


--- tcl-8.3.5-tclm4-soname.patch DELETED ---


--- tcl-8.4-no_rpath.patch DELETED ---


