From 18af36e2f0a808160a86dc6eed3f797a314065c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Tue, 29 Jul 2008 07:35:26 +0000
Subject: [PATCH] - fix 456922 - crash gitk resolved

---
 tk-8.5.3-crash.patch | 23 +++++++++++++++++++++++
 tk.spec              |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tk-8.5.3-crash.patch

diff --git a/tk-8.5.3-crash.patch b/tk-8.5.3-crash.patch
new file mode 100644
index 0000000..039d7f8
--- /dev/null
+++ b/tk-8.5.3-crash.patch
@@ -0,0 +1,23 @@
+diff -up tk8.5.3/library/tk.tcl.olde tk8.5.3/library/tk.tcl
+--- tk8.5.3/library/tk.tcl.olde	2008-06-30 05:37:37.000000000 +0200
++++ tk8.5.3/library/tk.tcl	2008-07-29 09:19:52.000000000 +0200
+@@ -510,7 +510,7 @@ proc ::tk::AmpWidget {class path args} {
+ 	}
+     }
+     set result [$class $path {*}$options]
+-    if {[string match "*button" $class]} {
++    if {$class eq "button"} {
+ 	bind $path <<AltUnderlined>> [list $path invoke]
+     }
+     return $result
+@@ -539,8 +539,8 @@ proc ::tk::AmpMenuArgs {widget add type 
+ #
+ proc ::tk::FindAltKeyTarget {path char} {
+     switch -- [winfo class $path] {
+-	Button - Label - 
+-        TButton - TLabel - TCheckbutton {
++	Button -
++	Label {
+ 	    if {[string equal -nocase $char \
+ 		  [string index [$path cget -text] [$path cget -underline]]]} {
+ 		return $path
diff --git a/tk.spec b/tk.spec
index 365282d..762bcbc 100644
--- a/tk.spec
+++ b/tk.spec
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -23,6 +23,7 @@ Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
 Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
+Patch3: tk-8.5.3-crash.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -46,6 +47,7 @@ The package contains the development files and man pages for tk.
 
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
+%patch3 -p1 -b .crash
 
 %build
 cd unix
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 29 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.3-2
+- fix 456922 - crash gitk resolved
+
 * Fri Jul 25 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.3-1
 - update to 8.5.3