From aaa94fbc37895c6688a6c7cd19c49022e73d7c57 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: Mon, 22 Jun 2009 16:43:03 +0000
Subject: [PATCH] - fix events (#489228, #491536, #506496)

---
 perl-Tk-events.patch | 25 +++++++++++++++++++++++++
 perl-Tk.spec         | 10 +++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 perl-Tk-events.patch

diff --git a/perl-Tk-events.patch b/perl-Tk-events.patch
new file mode 100644
index 0000000..d85344e
--- /dev/null
+++ b/perl-Tk-events.patch
@@ -0,0 +1,25 @@
+--- pTk/mTk/generic/tk.h.orig	2007-05-05 20:41:02.000000000 +0200
++++ pTk/mTk/generic/tk.h	2008-08-27 03:16:31.000000000 +0200
+@@ -677,17 +677,15 @@
+  *
+  *---------------------------------------------------------------------------
+  */
+-#define VirtualEvent        (LASTEvent)
+-#define ActivateNotify      (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT        (LASTEvent + 4)
++#define VirtualEvent        (MappingNotify + 1)
++#define ActivateNotify      (MappingNotify + 2)
++#define DeactivateNotify    (MappingNotify + 3)
++#define MouseWheelEvent     (MappingNotify + 4)
++#define TK_LASTEVENT        (MappingNotify + 5)
+ 
+ #define MouseWheelMask      (1L << 28)
+-
+ #define ActivateMask        (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT        (LASTEvent + 4)
+ 
+ 
+ /*
diff --git a/perl-Tk.spec b/perl-Tk.spec
index 8a765b9..71a8ce8 100644
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -3,7 +3,7 @@
 
 Name:           perl-Tk
 Version:        804.028
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl Graphical User Interface ToolKit
 
 Group:          Development/Libraries
@@ -17,6 +17,9 @@ Patch1:         perl-Tk-debian.patch.gz
 Patch2:         perl-Tk-seg.patch
 # fix interaction with XIM, bug #489228, upstream change r12589
 Patch3:		perl-Tk-XIM.patch
+# fix for bugs #491536 & #489228 & #506496 (see comment #8)
+# see http://rt.cpan.org/Public/Bug/Display.html?id=38746
+Patch4:		perl-Tk-events.patch
 
 # fix gif overflow in tk see CVE-2006-4484 and CVE-2007-6697 or #431518 and
 # #431529
@@ -60,6 +63,7 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
 # patch to fix #235666 ... seems like caching code is broken
 %patch2 -p1 -b .seg
 %patch3 -p1 -b .xim
+%patch4 -b .events
 %patch100
 
 %build
@@ -105,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{perl_vendorarch}/Tk/reindex.pl
 
 %changelog
+* Mon Jun 15 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 804.028-8
+- fix events (#489228, #491536, #506496) 
+
 * Thu Mar 19 2009 Stepan Kasal <skasal@redhat.com> - 804.028-7
 - perl-Tk-XIM.patch (#489228)