[wicd/f16] Fix usage of is_mouse_event() in wicd-curses (#800617)

[David Cantrell]

commit f360949779fb6d05fe7be2cd80d966f2d3a64620
Author: David Cantrell <dcantrell at redhat.com>
Date:   Wed Mar 21 14:30:06 2012 -0400

    Fix usage of is_mouse_event() in wicd-curses (#800617)
    
    - Make wicd-common require pygobject2 (#799537)

 wicd-1.7.0-is_mouse_event.patch |   16 ++++++++++++++++
 wicd.spec                       |   11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/wicd-1.7.0-is_mouse_event.patch b/wicd-1.7.0-is_mouse_event.patch
new file mode 100644
index 0000000..f112603
--- /dev/null
+++ b/wicd-1.7.0-is_mouse_event.patch
@@ -0,0 +1,16 @@
+diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py
+--- wicd-1.7.0/curses/wicd-curses.py.orig	2012-03-21 14:20:39.808063903 -0400
++++ wicd-1.7.0/curses/wicd-curses.py	2012-03-21 14:21:04.392066581 -0400
+@@ -881,7 +881,11 @@ class appGUI():
+                                                 data[4], False)
+             
+         for k in keys:
+-            if urwid.is_mouse_event(k):
++            if urwid.VERSION < (1, 0, 0):
++                check_mouse_event = urwid.is_mouse_event
++            else:
++                check_mouse_event = urwid.util.is_mouse_event
++            if check_mouse_event(k):
+                 event, button, col, row = k
+                 self.frame.mouse_event( self.size,
+                         event, button, col, row,
diff --git a/wicd.spec b/wicd.spec
index e545273..f37dd38 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.0
-Release:             10%{?dist}
+Release:             11%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -28,6 +28,7 @@ Patch4:              wicd-1.7.0-dbus-policy.patch
 Patch5:              wicd-1.7.0-wired_showing.patch
 Patch6:              wicd-1.7.0-initialize-check-and-message.patch
 Patch7:              wicd-1.7.0-CVE-2012-0813.patch
+Patch8:              wicd-1.7.0-is_mouse_event.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       python2-devel
@@ -58,6 +59,7 @@ Requires:            ethtool
 Requires:            iproute
 Requires:            logrotate
 Requires:            net-tools
+Requires:            pygobject2
 Requires:            wireless-tools
 Requires:            wpa_supplicant
 Requires(post):      systemd-units
@@ -118,6 +120,9 @@ Client program for wicd that uses a GTK+ interface.
 # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/682
 %patch7 -p1
 
+# Fix usage of is_mouse_event() in wicd-curses
+%patch8 -p1
+
 %build
 # NOTE: --etc is where dhclient.conf.template goes
 %{__python} setup.py configure \
@@ -302,6 +307,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Wed Mar 21 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-11
+- Fix usage of is_mouse_event() in wicd-curses (#800617)
+- Make wicd-common require pygobject2 (#799537)
+
 * Fri Jan 27 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-10
 - Fix CVS-2012-0813 (#785147)