rpms/tk/devel tk-8.4.13-cflags.patch,NONE,1.1 tk.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8873

Modified Files:
	tk.spec 
Added Files:
	tk-8.4.13-cflags.patch 
Log Message:
- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199378)


tk-8.4.13-cflags.patch:
 tcl.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tk-8.4.13-cflags.patch ---
--- tk8.4.13/unix/tcl.m4.5-cflags	2006-07-20 15:59:01.000000000 -0400
+++ tk8.4.13/unix/tcl.m4	2006-07-20 16:01:36.000000000 -0400
@@ -1340,7 +1340,7 @@
 	    #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"
@@ -1379,7 +1379,7 @@
 	    SHLIB_SUFFIX=".so"
 
 	    if test "$have_dl" = yes; then
-		SHLIB_LD="${CC} -shared"
+		SHLIB_LD="${CC} ${CFLAGS} -shared"
 		DL_OBJS=""
 		DL_LIBS="-ldl"
 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tk.spec	12 Jul 2006 18:47:04 -0000	1.21
+++ tk.spec	20 Jul 2006 20:04:17 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.13
-Release: 2
+Release: 3%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -19,6 +19,7 @@
 Patch2: tk-8.4.4-lib-perm.patch
 Patch3: tk-8.4-no_rpath.patch
 Patch4: tk-8.4.13-autoconf.patch
+Patch5: tk-8.4.13-cflags.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -45,6 +46,7 @@
 %patch2 -p1 -b .2-rolib
 %patch3 -p1 -b .3-rpath
 %patch4 -p1 -b .4-ac213
+%patch5 -p1 -b .5-cflags
 
 # patch1 touches tcl.m4
 cd unix
@@ -115,6 +117,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-3
+- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199378)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-2
 - rebuild