[deja-dup/f15/master] Update for NM 0.9
Daniel Williams
dcbw at fedoraproject.org
Wed Apr 6 21:25:40 UTC 2011
commit 95d59b582b1ab879553a8352a0cc2c969bd5a9d4
Author: Dan Williams <dcbw at redhat.com>
Date: Wed Apr 6 16:27:02 2011 -0500
Update for NM 0.9
deja-dup.spec | 6 +++++-
nm09.patch | 27 +++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/deja-dup.spec b/deja-dup.spec
index 3818f4d..cd3e8e7 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,12 +1,13 @@
Name: deja-dup
Version: 17.92
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple backup tool and frontend for duplicity
Group: Applications/Archiving
License: GPLv3+
URL: https://launchpad.net/deja-dup
Source0: http://launchpad.net/%{name}/18/%{version}/+download/%{name}-%{version}.tar.bz2
+Patch0: nm09.patch
BuildRequires: gettext desktop-file-utils intltool scrollkeeper
BuildRequires: gnome-doc-utils pango-devel cairo-devel vala-devel
@@ -91,6 +92,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg
%changelog
+* Wed Apr 05 2011 Dan Williams <dcbw at redhat.com> - 17.92-2
+- Update for NetworkManager 0.9
+
* Sun Mar 27 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 17.92-1
- Update to latest upstream release
- http://bazaar.launchpad.net/~deja-dup-team/deja-dup/trunk/revision/863
diff --git a/nm09.patch b/nm09.patch
new file mode 100644
index 0000000..7482437
--- /dev/null
+++ b/nm09.patch
@@ -0,0 +1,27 @@
+diff -up deja-dup-17.92/common/Network.vala.foo deja-dup-17.92/common/Network.vala
+--- deja-dup-17.92/common/Network.vala.foo 2011-04-06 16:13:01.731890996 -0500
++++ deja-dup-17.92/common/Network.vala 2011-04-06 16:16:48.560055254 -0500
+@@ -76,7 +76,10 @@ abstract class StatusProvider : Object
+
+ class StatusNetworkManager : StatusProvider
+ {
+- static const uint32 NM_STATE_CONNECTED = 3;
++ static const uint32 NM_OLD_STATE_CONNECTED = 3;
++ static const uint32 NM_STATE_CONNECTED_LOCAL = 50;
++ static const uint32 NM_STATE_CONNECTED_SITE = 60;
++ static const uint32 NM_STATE_CONNECTED_GLOBAL = 70;
+
+ protected override DBusProxy create_proxy() throws Error
+ {
+@@ -94,7 +97,10 @@ class StatusNetworkManager : StatusProvi
+ return Status.UNKNOWN;
+
+ uint32 state = state_val.get_uint32();
+- if (state == NM_STATE_CONNECTED)
++ if (state == NM_OLD_STATE_CONNECTED ||
++ state == NM_STATE_CONNECTED_LOCAL ||
++ state == NM_STATE_CONNECTED_SITE ||
++ state == NM_STATE_CONNECTED_GLOBAL)
+ return Status.ONLINE;
+ else
+ return Status.OFFLINE;
More information about the scm-commits
mailing list