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

[fedora-cvs-commits at redhat.com]

Author: mmaslano

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

Modified Files:
	tk-8.4.13-cflags.patch tk.spec 
Log Message:
Change some files and spec.


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

Index: tk-8.4.13-cflags.patch
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk-8.4.13-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tk-8.4.13-cflags.patch	20 Jul 2006 20:04:17 -0000	1.1
+++ tk-8.4.13-cflags.patch	19 Dec 2006 14:54:57 -0000	1.2
@@ -1,20 +1,20 @@
---- 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 @@
+--- tk8.5a5/unix/tcl.m4.5-cflags	2006-12-19 15:09:26.000000000 +0100
++++ tk8.5a5/unix/tcl.m4	2006-12-19 15:14:17.000000000 +0100
+@@ -1398,7 +1398,7 @@
+ 	    # get rid of the warnings.
  	    #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_LD='${CC} -shared -Wl,-soname,${@}'
++	    SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1428,7 +1428,7 @@
+ 	    SHLIB_LD_LIBS='${LIBS}'
  	    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"
+-	    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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tk.spec	18 Dec 2006 16:08:23 -0000	1.23
+++ tk.spec	19 Dec 2006 14:54:57 -0000	1.24
@@ -15,11 +15,11 @@
 BuildRequires: libX11-devel, sed
 # panedwindow.n from itcl conflicts
 Obsoletes: itcl <= 3.2
-Patch1: tk-8.3.5-tclm4-soname.patch
+Patch1: tk-8.5a5-tclm4-soname.patch
 Patch2: tk-8.5a5-lib-perm.patch
-Patch3: tk-8.4-no_rpath.patch
+Patch3: tk-8.5a5-no_rpath.patch
 Patch4: tk-8.4.13-autoconf.patch
-Patch5: tk-8.4.13-cflags.patch
+Patch5: tk-8.5a5-cflags.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful