[sugar] Add an extra NM patch

[Peter Robinson]

commit 12d2026437c5316c7af0dba6587af213d856f447
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jun 8 13:45:12 2011 +0100

    Add an extra NM patch

 n2.patch   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 sugar.spec |    9 +++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/n2.patch b/n2.patch
new file mode 100644
index 0000000..2d5cedc
--- /dev/null
+++ b/n2.patch
@@ -0,0 +1,47 @@
+--- sugar-0.92.1/src/jarabe/model/network.py.orig	2011-05-28 10:24:05.000000000 +0100
++++ sugar-0.92.1/src/jarabe/model/network.py	2011-05-28 10:30:37.562855006 +0100
+@@ -4,6 +4,7 @@
+ # Copyright (C) 2009 Paraguay Educa, Martin Abente
+ # Copyright (C) 2010 Plan Ceibal, Daniel Castelo
+ # Copyright (C) 2011 Peter Robinson
++# Copyright (C) 2011 John Dulaney (jdulaney)
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -126,17 +127,17 @@
+ NM_802_11_AP_FLAGS_NONE = 0x00000000
+ NM_802_11_AP_FLAGS_PRIVACY = 0x00000001
+ 
+-NM_802_11_AP_SEC_NONE = 0x00000000
+-NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001
+-NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002
+-NM_802_11_AP_SEC_PAIR_TKIP = 0x00000004
+-NM_802_11_AP_SEC_PAIR_CCMP = 0x00000008
+-NM_802_11_AP_SEC_GROUP_WEP40 = 0x00000010
+-NM_802_11_AP_SEC_GROUP_WEP104 = 0x00000020
+-NM_802_11_AP_SEC_GROUP_TKIP = 0x00000040
+-NM_802_11_AP_SEC_GROUP_CCMP = 0x00000080
+-NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100
+-NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200
++NM_802_11_AP_SEC_NONE = 0x0
++NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
++NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
++NM_802_11_AP_SEC_PAIR_TKIP = 0x4
++NM_802_11_AP_SEC_PAIR_CCMP = 0x8
++NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
++NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
++NM_802_11_AP_SEC_GROUP_TKIP = 0x40
++NM_802_11_AP_SEC_GROUP_CCMP = 0x80
++NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
++NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
+ 
+ NM_802_11_MODE_UNKNOWN = 0
+ NM_802_11_MODE_ADHOC = 1
+@@ -171,6 +172,7 @@
+ NM_GETSETTINGS_IFACE = 'org.freedesktop.NetworkManager.Settings.Connection.GetSettings'
+ NM_CONNECTION_IFACE = 'org.freedesktop.NetworkManager.Settings.Connection'
+ NM_SECRETS_IFACE = 'org.freedesktop.NetworkManager.AgentManager'
++NM_GETACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints'
+ NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
+ NM_ACTIVE_CONN_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
+ 
diff --git a/sugar.spec b/sugar.spec
index 623c476..4abaeda 100644
--- a/sugar.spec
+++ b/sugar.spec
@@ -3,12 +3,13 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.92.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://sugarlabs.org/
 License: GPLv2+
 Group: User Interface/Desktops
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  sugar-nm09-new.patch
+Patch1:  n2.patch
 
 BuildRequires: gettext
 BuildRequires: GConf2-devel
@@ -63,7 +64,8 @@ multiple instances of sugar.
 
 %prep
 %setup -q
-%patch0 -p1 -b nm09
+%patch0 -p1 -b .nm09
+%patch1 -p1 -b .n2
 
 %build
 %configure
@@ -144,6 +146,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Jun  8 2011 Peter Robinson <pbrobinson at gmail.com> - 0.92.1-6
+- Add an extra NM patch
+
 * Tue May 24 2011 Peter Robinson <pbrobinson at gmail.com> - 0.92.1-5
 - Add patch for NM-0.9 (thanks to John Dulaney for his assistance)