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

[David Cantrell]

commit eb6827b624846eee07e14a25baf1e6457ae85100
Author: David Cantrell <dcantrell at redhat.com>
Date:   Thu Mar 22 10:34:15 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.1-DaemonClosing.patch |   12 ++++++++++++
 wicd-1.7.1-child_pid.patch     |   11 +++++++++++
 wicd.spec                      |   22 ++++++++++++++++++----
 3 files changed, 41 insertions(+), 4 deletions(-)
---
diff --git a/wicd-1.7.1-DaemonClosing.patch b/wicd-1.7.1-DaemonClosing.patch
new file mode 100644
index 0000000..1079523
--- /dev/null
+++ b/wicd-1.7.1-DaemonClosing.patch
@@ -0,0 +1,12 @@
+diff -up wicd-1.7.1/wicd/wicd-daemon.py.orig wicd-1.7.1/wicd/wicd-daemon.py
+--- wicd-1.7.1/wicd/wicd-daemon.py.orig	2012-02-02 11:38:26.000000000 -0500
++++ wicd-1.7.1/wicd/wicd-daemon.py	2012-03-22 10:21:38.735140300 -0400
+@@ -812,7 +812,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.1-child_pid.patch b/wicd-1.7.1-child_pid.patch
new file mode 100644
index 0000000..19efb6f
--- /dev/null
+++ b/wicd-1.7.1-child_pid.patch
@@ -0,0 +1,11 @@
+diff -up wicd-1.7.1/wicd/wicd-daemon.py.orig wicd-1.7.1/wicd/wicd-daemon.py
+--- wicd-1.7.1/wicd/wicd-daemon.py.orig	2012-02-02 11:38:26.000000000 -0500
++++ wicd-1.7.1/wicd/wicd-daemon.py	2012-03-22 10:08:20.335062672 -0400
+@@ -1802,6 +1802,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([wpath.python, "-O", 
+                           os.path.join(wpath.daemon, "monitor.py")],
diff --git a/wicd.spec b/wicd.spec
index 1cf3855..e9f6ba1 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.1
-Release:             1%{?dist}
+Release:             2%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -23,6 +23,8 @@ Source3:             org.wicd.daemon.service
 Patch0:              wicd-1.7.0-remove-WHEREAREMYFILES.patch
 Patch1:              wicd-1.7.1-dbus-failure.patch
 Patch2:              wicd-1.7.0-dbus-policy.patch
+Patch3:              wicd-1.7.1-child_pid.patch
+Patch4:              wicd-1.7.1-DaemonClosing.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       python2-devel
@@ -78,6 +80,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
@@ -97,13 +100,18 @@ Client program for wicd that uses a GTK+ interface.
 # Allow users at the console to control wicd
 %patch2 -p1
 
+# Initialize child_pid to None in wicd-daemon.py
+%patch3 -p1
+
+# Work around bug in DaemonClosing() calls
+%patch4 -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 \
@@ -218,7 +226,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
 %{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf
-%config(noreplace) %{_sysconfdir}/dhcp/dhclient.conf.template.default
+%config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default
 %config(noreplace) %{_sysconfdir}/logrotate.d/wicd
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap
@@ -282,6 +290,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Thu Mar 22 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-2
+- 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)
+
 * Fri Feb 10 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-1
 - Upgrade to wicd-1.7.1 final release (#789380)
 - Have wicd-common require pygobject2 (#754416)