From f3af943817f04fa6acda2db570a32b51685a120f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:22:47 +0000
Subject: [PATCH] auto-import changelog data from tk-8.4.7-1.src.rpm Fri Jul 30
 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-1 - update to 8.4.7 -
 replace tk-8.4.5-no_rpath.patch with tk-8.4-no_rpath.patch - replace
 tk-8.4.5-autoconf.patch with tk-8.4-autoconf.patch

---
 .cvsignore            |  2 +-
 sources               |  2 +-
 tk-8.4-no_rpath.patch | 11 +++++++++++
 tk.spec               | 13 +++++++++----
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 tk-8.4-no_rpath.patch

diff --git a/.cvsignore b/.cvsignore
index 1210318..4d67180 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tk8.4.6-src.tar.gz
+tk8.4.7-src.tar.gz
diff --git a/sources b/sources
index b4592f4..eae736e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24b7774d54c1c568cabe16f3498ddccd  tk8.4.6-src.tar.gz
+b86b0db1c28723e6d3139e88250353a6  tk8.4.7-src.tar.gz
diff --git a/tk-8.4-no_rpath.patch b/tk-8.4-no_rpath.patch
new file mode 100644
index 0000000..89aafb5
--- /dev/null
+++ b/tk-8.4-no_rpath.patch
@@ -0,0 +1,11 @@
+--- tk8.4.7/unix/tcl.m4.no_rpath	2003-12-01 14:50:28.000000000 +0100
++++ tk8.4.7/unix/tcl.m4	2003-12-01 14:50:31.000000000 +0100
+@@ -1125,7 +1125,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}
+ 	    else
+ 		AC_CHECK_HEADER(dld.h, [
diff --git a/tk.spec b/tk.spec
index 0946ca3..3248451 100644
--- a/tk.spec
+++ b/tk.spec
@@ -2,8 +2,8 @@
 
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
-Version: %{majorver}.6
-Release: 3
+Version: %{majorver}.7
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -17,8 +17,8 @@ BuildRequires: XFree86-devel, perl
 Obsoletes: itcl <= 3.2
 Patch1: tk-8.3.5-tclm4-soname.patch
 Patch2: tk-8.4.4-lib-perm.patch
-Patch3: tk-8.4.5-no_rpath.patch
-Patch4: tk-8.4.5-autoconf.patch
+Patch3: tk-8.4-no_rpath.patch
+Patch4: tk-8.4-autoconf.patch
 Patch5: tk-8.4.5-pkgIndex-loc.patch
 
 %description
@@ -117,6 +117,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/mann/*
 
 %changelog
+* Fri Jul 30 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-1
+- update to 8.4.7
+  - replace tk-8.4.5-no_rpath.patch with tk-8.4-no_rpath.patch
+  - replace tk-8.4.5-autoconf.patch with tk-8.4-autoconf.patch
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt