rpms/tcl/devel tcl-8.4.13-cflags.patch,1.1,1.2 tcl.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

Author: dcantrel

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

Modified Files:
	tcl-8.4.13-cflags.patch tcl.spec 
Log Message:
- Fix cflags patch so it applies correctly
- Changes $(CFLAGS) to ${CFLAGS} in cflags patch


tcl-8.4.13-cflags.patch:
 tcl8.4.13/unix/tcl.m4 |    2 +-
 tk8.4.13/unix/tcl.m4  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: tcl-8.4.13-cflags.patch
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl-8.4.13-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-8.4.13-cflags.patch	20 Jul 2006 19:00:09 -0000	1.1
+++ tcl-8.4.13-cflags.patch	20 Jul 2006 19:20:34 -0000	1.2
@@ -1,22 +1,22 @@
---- tcl8.4.13/unix/tcl.m4.BAD 2006-07-13 14:05:38.000000000 -0400
-+++ tcl8.4.13/unix/tcl.m4  2006-07-13 14:07:58.000000000 -0400
+--- tcl-8.4.13/tcl8.4.13/unix/tcl.m4.6-cflags	2006-07-20 15:11:19.000000000 -0400
++++ tcl-8.4.13/tcl8.4.13/unix/tcl.m4	2006-07-20 15:12:40.000000000 -0400
 @@ -1340,7 +1340,7 @@
-       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
-       if test "$have_dl" = yes; then
--     SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
-+     SHLIB_LD='${CC} $(CFLAGS) -shared -Wl,-soname,${@}'
-      DL_OBJS="tclLoadDl.o"
-      DL_LIBS="-ldl"
-      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
---- tk8.4.13/unix/tcl.m4.BAD  2006-07-13 13:57:14.000000000 -0400
-+++ tk8.4.13/unix/tcl.m4   2006-07-13 13:57:26.000000000 -0400
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
++		SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+--- tcl-8.4.13/tk8.4.13/unix/tcl.m4.6-cflags	2006-04-19 08:29:38.000000000 -0400
++++ tcl-8.4.13/tk8.4.13/unix/tcl.m4	2006-07-20 15:13:04.000000000 -0400
 @@ -1340,7 +1340,7 @@
-       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
-       if test "$have_dl" = yes; then
--     SHLIB_LD="${CC} -shared"
-+     SHLIB_LD="${CC} $(CFLAGS) -shared"
-      DL_OBJS="tclLoadDl.o"
-      DL_LIBS="-ldl"
-      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD="${CC} -shared"
++		SHLIB_LD="${CC} ${CFLAGS} -shared"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tcl.spec	20 Jul 2006 19:00:09 -0000	1.23
+++ tcl.spec	20 Jul 2006 19:20:34 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -67,7 +67,9 @@
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 %patch5 -p1 -b .5-ac213
+pushd ..
 %patch6 -p1 -b .6-cflags
+popd
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
@@ -150,6 +152,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-3
+- Fix cflags patch so it applies correctly
+- Changes $(CFLAGS) to ${CFLAGS} in cflags patch
+
 * Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-2
 - Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199375)