[empathy/f15/master] Rebuild for NM 0.9

[Daniel Williams]

commit f5530bcc9548363713c5e012f6bfad31b0a06d20
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Mar 24 17:19:45 2011 -0500

    Rebuild for NM 0.9

 empathy.spec       |    9 ++++++---
 nm09-empathy.patch |    3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/empathy.spec b/empathy.spec
index b8fe6ca..5c0427a 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -13,7 +13,7 @@
 
 Name:		empathy
 Version:	2.91.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -23,7 +23,7 @@ URL:		http://live.gnome.org/Empathy
 Source0:	http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
-#Patch0:         nm09-empathy.patch
+Patch0:         nm09-empathy.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -81,7 +81,7 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .nm09
+%patch0 -p1 -b .nm09
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -161,6 +161,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Wed Mar 24 2011 Dan Williams <dcbw at redhat.com> 2.91.92-2
+- Rebuild for NM 0.9
+
 * Wed Mar 23 2011 Ray Strode <rstrode at redhat.com> 2.91.92-1
 - Update to 2.91.92
 - Disable libchamplain support for now at the request of bpepple.
diff --git a/nm09-empathy.patch b/nm09-empathy.patch
index d8a795d..874dba3 100644
--- a/nm09-empathy.patch
+++ b/nm09-empathy.patch
@@ -13,7 +13,7 @@ diff -up empathy-2.91.90.2/libempathy/empathy-connectivity.c.foo empathy-2.91.90
  static void
  connectivity_nm_state_change_cb (NMClient *client,
      const GParamSpec *pspec,
-@@ -103,7 +108,11 @@ connectivity_nm_state_change_cb (NMClien
+@@ -103,7 +108,10 @@ connectivity_nm_state_change_cb (NMClien
  
    state = nm_client_get_state (priv->nm_client);
    new_nm_connected = !(state == NM_STATE_CONNECTING
@@ -21,7 +21,6 @@ diff -up empathy-2.91.90.2/libempathy/empathy-connectivity.c.foo empathy-2.91.90
 +      || state == NM_STATE_DISCONNECTING
 +#endif
        || state == NM_STATE_DISCONNECTED);
-+    new_nm_connected = TRUE;
  
    DEBUG ("New NetworkManager network state %d (connected: %s)", state,
        new_nm_connected ? "true" : "false");