Sugar rpm fixes

* Bump minor release number to 54
* Lease information fix for XO1 and XO1.5
* ##TEMP## Always enable wireless after restart

NOTE: The WLAN fix is TEMPORARY and should be removed as soon as a
permanent solution is in place.

3 files changed, 145 insertions, 5 deletions

diff --git a/rpms/sugar/Always-enable-wireless-workaround.patch b/rpms/sugar/Always-enable-wireless-workaround.patch
new file mode 100644
index 0000000..4e0e46e
--- /dev/null
+++ b/rpms/sugar/Always-enable-wireless-workaround.patch
@@ -0,0 +1,69 @@
+From patchwork Mon Feb 14 20:46:03 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [1/2] Always enable wireless workaround
+Date: Tue, 15 Feb 2011 01:46:03 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 661
+Message-Id: <1297716363-2934-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	anish@sugarlabs.org
+
+As reported at #2602 the wireless device gets
+disabled unexpectedly, creating confusion among
+the users.
+
+This patch contains a workaround that will enable
+the wireless device on every boot.
+
+PLEASE revert it as soon as a mainstream solution
+arrives.
+
+Signed-off-by: Martin Abente <martin.abente.lahaye@gmail.com>
+
+---
+bin/sugar-session |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index e4a9707..d85189f 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -33,6 +33,7 @@ import logging
+ import gconf
+ import gtk
+ import gobject
++import dbus
+ import dbus.glib
+ import wnck
+ 
+@@ -192,6 +193,7 @@ def bootstrap():
+     gobject.idle_add(setup_file_transfer_cb)
+     gobject.idle_add(show_software_updates_cb)
+     gobject.idle_add(setup_accessibility_cb)
++    gobject.idle_add(setup_wireless_cb)
+ 
+     if sys.modules.has_key('xklavier'):
+         gobject.idle_add(setup_keyboard_cb)
+@@ -203,6 +205,20 @@ def set_fonts():
+     settings = gtk.settings_get_default()
+     settings.set_property("gtk-font-name", "%s %f" % (face, size))
+ 
++def setup_wireless_cb():
++    #XXX: Revert this patch atfer #2602 gets fixed.
++    logging.debug('Enabling wireless device')
++    try:
++        bus = dbus.SystemBus()
++        obj = bus.get_object('org.freedesktop.NetworkManager',
++                            '/org/freedesktop/NetworkManager')
++        nm_props = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
++    except:
++        logging.exception('Could not enable wireless device')
++    else:
++        nm_props.Set('org.freedesktop.NetworkManager', 
++                    'WirelessEnabled', True)
++
+ def setup_accessibility_cb():
+     from jarabe.model import accessibility
+     accessibility_manager = accessibility.AccessibilityManager()
diff --git a/rpms/sugar/Lease-info-fix-all-xo-models-path-version.patch b/rpms/sugar/Lease-info-fix-all-xo-models-path-version.patch
new file mode 100644
index 0000000..f255d9d
--- /dev/null
+++ b/rpms/sugar/Lease-info-fix-all-xo-models-path-version.patch
@@ -0,0 +1,57 @@
+From patchwork Mon Feb 14 20:48:00 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [2/2] Fix all xo models path version
+Date: Tue, 15 Feb 2011 01:48:00 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 662
+Message-Id: <1297716480-2988-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	anish@sugarlabs.org
+
+Expiration date feature was using a harcoded
+lease.sig path, which was only available for
+the XO 1.0. 
+
+This add a new method to determine which path
+should be used.
+
+Signed-off-by: Martin Abente <martin.abente.lahaye@gmail.com>
+
+---
+extensions/cpsection/aboutcomputer/model.py |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
+index 5bbd4af..59e370a 100644
+--- a/extensions/cpsection/aboutcomputer/model.py
++++ b/extensions/cpsection/aboutcomputer/model.py
+@@ -25,6 +25,9 @@ from datetime import datetime
+ 
+ from jarabe import config
+ 
++_XO_1_0_LEASE_PATH = '/security/lease.sig'
++_XO_1_5_LEASE_PATH = '/bootpart/boot/security/lease.sig'
++
+ _logger = logging.getLogger('ControlPanel - AboutComputer')
+ _not_available = _('Not available')
+ 
+@@ -36,8 +39,16 @@ def get_aboutcomputer():
+ def print_aboutcomputer():
+     print get_aboutcomputer()
+ 
++def _get_lease_path():
++    if os.path.exists(_XO_1_0_LEASE_PATH):
++        return _XO_1_0_LEASE_PATH
++    elif os.path.exists(_XO_1_5_LEASE_PATH):
++        return _XO_1_5_LEASE_PATH
++    else:
++        return ''
++
+ def get_lease_days():
+-    lease_file = _read_file('/security/lease.sig')
++    lease_file = _read_file(_get_lease_path())
+     if lease_file == None: 
+         return 'Information not available!'
+ 
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 637f8d3..fb86cd9 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.53dxo%{?dist}
+Release: 5.54dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -168,11 +168,18 @@ patch2801: sugar-More-robust-completed-activity-downloads.patch
 
 #feedback feature fixes
 patch2901: sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch
-patch3001: sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch
-patch3002: sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
+patch2902: sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch
+patch2903: sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
 
 #microformat updater exception handler fix
-patch3101: microformat-fix-exception-handler.patch
+patch3001: microformat-fix-exception-handler.patch
+
+#sl#2602: temorary fix
+#REPLACE AS SOON AS PERMANENT FIX IS PRESENT
+patch3101: Always-enable-wireless-workaround.patch
+
+#lease.sig path fix for both xo-1 and xo-1.5
+patch3201: Lease-info-fix-all-xo-models-path-version.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -374,12 +381,15 @@ multiple instances of sugar.
 %patch2801 -p1
 
 %patch2901 -p1
+%patch2902 -p1
+%patch2903 -p1
 
 %patch3001 -p1
-%patch3002 -p1
 
 %patch3101 -p1
 
+%patch3201 -p1
+
 %build
 autoreconf
 %configure
@@ -456,6 +466,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Mon Feb 14 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.54
+- Lease info fix for XO1 and XO1.5
+- Temporary fix for sl#2602
+
 * Sat Feb 12 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.53
 - Feeback fixes (change server url, send report with s/n enabled)
 - Microformat updater exception catching fix