rpms/tk/devel tk-8.5.3-crash.patch,NONE,1.1 tk.spec,1.54,1.55

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

Author: mmaslano

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

Modified Files:
	tk.spec 
Added Files:
	tk-8.5.3-crash.patch 
Log Message:
* Tue Jul 29 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.3-2
- fix 456922 - crash gitk resolved


tk-8.5.3-crash.patch:

--- NEW FILE tk-8.5.3-crash.patch ---
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


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tk.spec	25 Jul 2008 07:45:06 -0000	1.54
+++ tk.spec	29 Jul 2008 07:35:26 -0000	1.55
@@ -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 @@
 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 @@
 
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
+%patch3 -p1 -b .crash
 
 %build
 cd unix
@@ -113,6 +115,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 29 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.3-2
+- fix 456922 - crash gitk resolved
+
 * Fri Jul 25 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.3-1
 - update to 8.5.3