packages: geoclue/geoclue.spec, geoclue/geoclue-nm09.patch (NEW) - added su...

megabajt megabajt at pld-linux.org
Thu Apr 7 15:07:33 CEST 2011


Author: megabajt                     Date: Thu Apr  7 13:07:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added support for NM 0.9
- release 5

---- Files affected:
packages/geoclue:
   geoclue.spec (1.16 -> 1.17) , geoclue-nm09.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/geoclue/geoclue.spec
diff -u packages/geoclue/geoclue.spec:1.16 packages/geoclue/geoclue.spec:1.17
--- packages/geoclue/geoclue.spec:1.16	Wed Apr  6 21:34:26 2011
+++ packages/geoclue/geoclue.spec	Thu Apr  7 15:07:28 2011
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Modularna usługa geoinformacyjna
 Name:		geoclue
 Version:	0.12.0
-Release:	4
+Release:	5
 License:	LGPL v2
 Group:		Applications
 Source0:	http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 # Source0-md5:	33af8307f332e0065af056ecba65fec2
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-libsoup.patch
+Patch2:		%{name}-nm09.patch
 URL:		http://geoclue.freedesktop.org/
 BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	NetworkManager-devel
@@ -121,6 +122,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -228,6 +230,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/04/07 13:07:28  megabajt
+- added support for NM 0.9
+- release 5
+
 Revision 1.16  2011/04/06 19:34:26  megabajt
 - removed libtool file
 - release 4

================================================================
Index: packages/geoclue/geoclue-nm09.patch
diff -u /dev/null packages/geoclue/geoclue-nm09.patch:1.1
--- /dev/null	Thu Apr  7 15:07:33 2011
+++ packages/geoclue/geoclue-nm09.patch	Thu Apr  7 15:07:28 2011
@@ -0,0 +1,43 @@
+From f2f988bfdda6a347a8190612af1501466b64d76b Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Mon, 07 Mar 2011 23:45:45 +0000
+Subject: master: Support NetworkManager 0.9
+
+---
+diff --git a/src/connectivity-networkmanager.c b/src/connectivity-networkmanager.c
+index a545073..09630a0 100644
+--- a/src/connectivity-networkmanager.c
++++ b/src/connectivity-networkmanager.c
+@@ -38,6 +38,10 @@
+ #include <nm-device-wifi.h>
+ #include <nm-setting-ip4-config.h>
+ 
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "connectivity-networkmanager.h"
+ 
+ static void geoclue_networkmanager_connectivity_init (GeoclueConnectivityInterface *iface);
+@@ -285,10 +289,19 @@ nmstate_to_geocluenetworkstatus (NMState status)
+ 			return GEOCLUE_CONNECTIVITY_UNKNOWN;
+ 		case NM_STATE_ASLEEP:
+ 		case NM_STATE_DISCONNECTED:
++#if NM_CHECK_VERSION(0,8,992)
++		case NM_STATE_DISCONNECTING:
++#endif
+ 			return GEOCLUE_CONNECTIVITY_OFFLINE;
+ 		case NM_STATE_CONNECTING:
+ 			return GEOCLUE_CONNECTIVITY_ACQUIRING;
++#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
+ 			return GEOCLUE_CONNECTIVITY_ONLINE;
+ 		default:
+ 			g_warning ("Unknown NMStatus: %d", status);
+--
+cgit v0.8.3-6-g21f6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geoclue/geoclue.spec?r1=1.16&r2=1.17&f=u



More information about the pld-cvs-commit mailing list