[pidgin/f15/master] Update for NetworkManager 0.9

[Daniel Williams]

commit 87ebfefb97be2da802c610ecf31bf1450bc8ad30
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Mar 10 02:48:47 2011 -0600

    Update for NetworkManager 0.9

 nm09-pidgin.patch |   38 ++++++++++++++++++++++++++++++++++++++
 pidgin.spec       |    8 +++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/nm09-pidgin.patch b/nm09-pidgin.patch
new file mode 100644
index 0000000..1c2471d
--- /dev/null
+++ b/nm09-pidgin.patch
@@ -0,0 +1,38 @@
+diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
+--- pidgin-2.7.10/libpurple/network.c.foo	2011-03-10 02:21:43.920933267 -0600
++++ pidgin-2.7.10/libpurple/network.c	2011-03-10 02:23:11.466838793 -0600
+@@ -71,6 +71,10 @@
+ #include <dbus/dbus-glib.h>
+ #include <NetworkManager.h>
+ 
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static DBusGConnection *nm_conn = NULL;
+ static DBusGProxy *nm_proxy = NULL;
+ static DBusGProxy *dbus_proxy = NULL;
+@@ -863,7 +867,13 @@ nm_update_state(NMState state)
+ 
+ 	switch(state)
+ 	{
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_CONNECTED_LOCAL:
++		case NM_STATE_CONNECTED_SITE:
++		case NM_STATE_CONNECTED_GLOBAL:
++#else
+ 		case NM_STATE_CONNECTED:
++#endif
+ 			/* Call res_init in case DNS servers have changed */
+ 			res_init();
+ 			/* update STUN IP in case we it changed (theoretically we could
+@@ -880,6 +890,9 @@ nm_update_state(NMState state)
+ 		case NM_STATE_ASLEEP:
+ 		case NM_STATE_CONNECTING:
+ 		case NM_STATE_DISCONNECTED:
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_DISCONNECTING:
++#endif
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
diff --git a/pidgin.spec b/pidgin.spec
index 8b10c02..6daa890 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -98,7 +98,7 @@
 
 Name:           pidgin
 Version:        2.7.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -132,6 +132,8 @@ Source1:        purple-fedora-prefs.xml
 ## Patches 0-99: Fedora specific or upstream wont accept
 Patch0:         pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
+Patch1: nm09-pidgin.patch
+
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.7.7-msn-disable-msnp16.patch
 
@@ -408,6 +410,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %if %{force_sound_aplay}
 %patch0 -p1 -b .aplay
 %endif
+%patch1 -p1 -b .nm09
 
 ## Patches 100+: To be Included in Future Upstream
 # not strictly going to be included upstream, but enabling MSNP16
@@ -676,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Mar 10 2011 Dan Williams <dcbw at redhat.com> 2.7.10-2
+- Update for NetworkManager 0.9
+
 * Tue Feb 22 2011 Stu Tomlinson <stu at nosnilmot.com> 2.7.10-1
 - 2.7.10