[liferea/f15/master] Build against NM 0.9

[Christopher Aillon]

commit 8f0c23addda9ccd0acdc6e9e0adc5214de9af1f9
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sun Mar 27 11:43:37 2011 -0700

    Build against NM 0.9

 liferea-1.6.5-nm09.patch |   36 ++++++++++++++++++++++++++++++++++++
 liferea.spec             |    7 ++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/liferea-1.6.5-nm09.patch b/liferea-1.6.5-nm09.patch
new file mode 100644
index 0000000..15933c1
--- /dev/null
+++ b/liferea-1.6.5-nm09.patch
@@ -0,0 +1,36 @@
+Based on http://liferea.git.sourceforge.net/git/gitweb.cgi?p=liferea/liferea;a=commitdiff;h=fc49ae0c9c1add55754ff5731c586b22096fbb06
+
+diff -up liferea-1.6.5/src/update.c.nm09 liferea-1.6.5/src/update.c
+--- liferea-1.6.5/src/update.c.nm09	2011-03-27 10:40:26.045331006 -0700
++++ liferea-1.6.5/src/update.c	2011-03-27 11:06:53.819481098 -0700
+@@ -589,6 +589,17 @@ update_process_finished_job (updateJobPt
+ }
+ 
+ #ifdef USE_NM
++static gboolean
++is_nm_connected (guint state)
++{
++	if (state == 3 ||  /* NM_STATE_CONNECTED */
++           state == 50 || /* NM_STATE_CONNECTED_LOCAL */
++           state == 60 || /* NM_STATE_CONNECTED_SITE */
++           state == 70)   /* NM_STATE_CONNECTED_GLOBAL */
++               return TRUE;
++	return FALSE;
++}
++
+ static void
+ update_network_monitor (libnm_glib_ctx *ctx, gpointer user_data)
+ {
+@@ -600,10 +611,10 @@ update_network_monitor (libnm_glib_ctx *
+ 	state = libnm_glib_get_network_state (ctx);
+ 	online = network_is_online ();
+ 
+-	if (online && state == LIBNM_NO_NETWORK_CONNECTION) {
++	if (online && !is_nm_connected (state)) {
+ 		debug0 (DEBUG_UPDATE, "network manager: no network connection -> going offline");
+ 		network_set_online (FALSE);
+-	} else if (!online && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
++	} else if (!online && is_nm_connected (state)) {
+ 		debug0 (DEBUG_UPDATE, "network manager: active connection -> going online");
+ 		network_set_online (TRUE);
+ 	}
diff --git a/liferea.spec b/liferea.spec
index b83aa6b..6b07deb 100644
--- a/liferea.spec
+++ b/liferea.spec
@@ -1,6 +1,6 @@
 Name:           liferea
 Version:        1.6.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@ Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.g
 Patch0:	        %{name}-fedorafeed.patch
 Patch1:		lX11.patch
 Patch2:		libnotify-0.7-api.patch
+Patch3:         liferea-1.6.5-nm09.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Epoch:		1
 
@@ -46,6 +47,7 @@ browse through their items, and show their contents.
 %patch0 -p1 -b .fedorafeed
 %patch1 -p1 -b .lX11
 %patch2 -p1 -b .libnotify
+%patch3 -p1 -b .nm09
 
 %build
 #autoreconf -f -i
@@ -118,6 +120,9 @@ fi
 %dir %{_libdir}/%{name}
 
 %changelog
+* Sun Mar 27 2011 Christopher Aillon <caillon at redhat.com> - 1.6.5-4
+- Rebuild against NM 0.9
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild