[krb5-auth-dialog/f15/master] Update for NetworkManager 0.9

[Daniel Williams]

commit c4f8abc8dae32f904360c36a61c9df3dff2f0c39
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Mar 10 03:10:37 2011 -0600

    Update for NetworkManager 0.9

 krb5-auth-dialog.spec |    7 ++++++-
 nm09-krb5.patch       |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index 3d4eb38..48b0135 100644
--- a/krb5-auth-dialog.spec
+++ b/krb5-auth-dialog.spec
@@ -1,11 +1,12 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 2.91.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0: nm09-krb5.patch
 BuildRequires: krb5-devel
 BuildRequires: perl(XML::Parser), gettext
 BuildRequires: intltool
@@ -29,6 +30,7 @@ tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nm09
 
 %build
 %configure --disable-static
@@ -78,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Mar 10 2011 Dan Williams <dcbw at redhat.com> - 2.91.91-2
+- Update for NetworkManager 0.9
+
 * Tue Mar  8 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.91-1
 - Update to 2.91.91
 
diff --git a/nm09-krb5.patch b/nm09-krb5.patch
new file mode 100644
index 0000000..bebb43f
--- /dev/null
+++ b/nm09-krb5.patch
@@ -0,0 +1,49 @@
+From 3deb396641e2e28a6637d3f57af27aebfd7882a8 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Mon, 7 Mar 2011 22:41:28 -0600
+Subject: [PATCH] Update for NetworkManager 0.9
+
+Fix up the defines a bit for additional NM 0.9 states.
+---
+ src/ka-dialog.c |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/src/ka-dialog.c b/src/ka-dialog.c
+index 5b11621..a681a88 100644
+--- a/src/ka-dialog.c
++++ b/src/ka-dialog.c
+@@ -44,6 +44,10 @@
+ 
+ #ifdef ENABLE_NETWORK_MANAGER
+ #include <nm-client.h>
++
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #ifdef HAVE_HX509_ERR_H
+@@ -471,11 +475,20 @@ ka_nm_client_state_changed_cb (NMClient * client,
+         KA_DEBUG ("Network state: %d", state);
+         /* do nothing */
+         break;
++#if NM_CHECK_VERSION(0,8,992)
++    case NM_STATE_DISCONNECTING:
++#endif
+     case NM_STATE_DISCONNECTED:
+         KA_DEBUG ("Network disconnected");
+         *online = FALSE;
+         break;
++#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
+         KA_DEBUG ("Network connected");
+         *online = TRUE;
+         break;
+-- 
+1.7.4.1
+