[wicd/f16] Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412)

[David Cantrell]

commit 84969edea6c50b02273b938ba4d7a10d84651b61
Author: David Cantrell <dcantrell at redhat.com>
Date:   Mon Mar 26 15:32:19 2012 -0400

    Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412)
    
    - Initialize child_pid to None in wicd-daemon.py (#798692)
    - Make wicd-gtk subpackage require notify-python (#748258)
    - Work around no-op problem in DaemonClosing calls (#740317)

 wicd-1.7.0-DaemonClosing.patch |   12 ++++++++++++
 wicd-1.7.0-child_pid.patch     |   11 +++++++++++
 wicd.spec                      |   19 +++++++++++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/wicd-1.7.0-DaemonClosing.patch b/wicd-1.7.0-DaemonClosing.patch
new file mode 100644
index 0000000..7751d19
--- /dev/null
+++ b/wicd-1.7.0-DaemonClosing.patch
@@ -0,0 +1,12 @@
+diff -up wicd-1.7.0/wicd/wicd-daemon.py.orig wicd-1.7.0/wicd/wicd-daemon.py
+--- wicd-1.7.0/wicd/wicd-daemon.py.orig	2012-03-26 15:26:26.917169045 -0400
++++ wicd-1.7.0/wicd/wicd-daemon.py	2012-03-26 15:27:03.948188499 -0400
+@@ -846,7 +846,7 @@ class WicdDaemon(dbus.service.Object):
+         pass
+ 
+     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
+-    def DaemonClosing(self):
++    def DaemonClosing(self, arg1=None, arg2=None):
+         """ Emits a signal indicating the daemon will be closing. """
+         pass
+ 
diff --git a/wicd-1.7.0-child_pid.patch b/wicd-1.7.0-child_pid.patch
new file mode 100644
index 0000000..2ac11fb
--- /dev/null
+++ b/wicd-1.7.0-child_pid.patch
@@ -0,0 +1,11 @@
+diff -up wicd-1.7.0/wicd/wicd-daemon.py.orig wicd-1.7.0/wicd/wicd-daemon.py
+--- wicd-1.7.0/wicd/wicd-daemon.py.orig	2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/wicd/wicd-daemon.py	2012-03-26 15:24:27.863044957 -0400
+@@ -1801,6 +1801,7 @@ def main(argv):
+     bus = dbus.SystemBus()
+     wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus)
+     daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
++    child_pid = None
+     if not no_poll:
+         child_pid = Popen([misc.find_path("python"), "-O", 
+                           os.path.join(wpath.daemon, "monitor.py")],
diff --git a/wicd.spec b/wicd.spec
index f37dd38..fd5082e 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.0
-Release:             11%{?dist}
+Release:             12%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -29,6 +29,8 @@ 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
+Patch9:              wicd-1.7.0-child_pid.patch
+Patch10:             wicd-1.7.0-DaemonClosing.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       python2-devel
@@ -84,6 +86,7 @@ Summary:             GTK+ client for wicd
 Group:               Applications/Internet
 BuildArch:           noarch
 Requires:            %{name}-common = %{version}-%{release}
+Requires:            notify-python
 Requires:            pygtk2-libglade >= 2.10
 
 %description gtk
@@ -123,13 +126,19 @@ Client program for wicd that uses a GTK+ interface.
 # Fix usage of is_mouse_event() in wicd-curses
 %patch8 -p1
 
+# Initialize child_pid to None in wicd-daemon.py
+%patch9 -p1
+
+# Work around bug in DaemonClosing() calls
+%patch10 -p1
+
 %build
 # NOTE: --etc is where dhclient.conf.template goes
 %{__python} setup.py configure \
     --distro redhat \
     --lib %{_libdir} \
     --share %{_datadir}/wicd \
-    --etc %{_sysconfdir}/dhcp \
+    --etc %{_sysconfdir}/wicd \
     --bin %{_bindir} \
     --pmutils %{_libdir}/pm-utils/sleep.d \
     --log %{_localstatedir}/log \
@@ -307,6 +316,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Mon Mar 26 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-12
+- Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412)
+- Initialize child_pid to None in wicd-daemon.py (#798692)
+- Make wicd-gtk subpackage require notify-python (#748258)
+- Work around no-op problem in DaemonClosing calls (#740317)
+
 * 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)