rpms/tk/devel tk-confi.patch,1.1,1.2 tk.spec,1.40,1.41

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1791

Modified Files:
	tk-confi.patch tk.spec 
Log Message:
Now patch with soname


tk-confi.patch:

Index: tk-confi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk-confi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tk-confi.patch	31 Jul 2007 10:00:46 -0000	1.1
+++ tk-confi.patch	9 Aug 2007 08:21:21 -0000	1.2
@@ -1,5 +1,5 @@
 --- tk8.4.15/unix/tcl.m4.confi	2007-05-25 18:09:54.000000000 +0200
-+++ tk8.4.15/unix/tcl.m4	2007-07-31 11:18:27.000000000 +0200
++++ tk8.4.15/unix/tcl.m4	2007-08-09 08:00:08.000000000 +0200
 @@ -1124,7 +1124,7 @@
  
  	    # AIX v<=4.1 has some different flags than 4.2+
@@ -9,7 +9,12 @@
  		DL_LIBS="-lld"
  	    fi
  
-@@ -1349,7 +1349,7 @@
+@@ -1345,11 +1345,11 @@
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++		SHLIB_LD='${CC} ${CFLAGS} -shared ${LDFLAGS} -Wl,-soname,${@}'
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS="-ldl"
  		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -23,10 +28,19 @@
  	    # Disable inlining only when one of the
  	    # files in compat/*.c is being linked in.
 -	    if test x"${LIBOBJS}" != x ; then
-+	    if test x"${AC_LIBOBJ}" != x ; then
++	    if test x"${LIB@&t at OBJS}" != x ; then
  	        CFLAGS="$CFLAGS -fno-inline"
  	    fi
  
+@@ -1395,7 +1395,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"
 @@ -2633,7 +2633,7 @@
  		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
  		    tcl_cv_strtod_buggy=buggy)])
@@ -37,7 +51,7 @@
  	fi
      fi
 --- tk8.4.15/unix/Makefile.in.confi	2007-05-25 18:09:53.000000000 +0200
-+++ tk8.4.15/unix/Makefile.in	2007-07-31 11:18:39.000000000 +0200
++++ tk8.4.15/unix/Makefile.in	2007-07-31 11:26:15.000000000 +0200
 @@ -639,7 +639,7 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tk.spec	31 Jul 2007 10:00:46 -0000	1.40
+++ tk.spec	9 Aug 2007 08:21:21 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: BSD
 Group: Development/Languages
@@ -107,6 +107,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug  9 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-2
+- Resolves: rhbz#251411
+
 * Tue Jul 31 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-1
 - Update tk8.4.15