From b0c3a1f040aacbd709b457136656989ef1309cd1 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <erikos@fedoraproject.org>
Date: Mar 22 2009 17:40:09 +0000
Subject: - Update to latest NM-User config file (same as nm-applet)

- Fix nondeterministic denials for no-interface messages #575 (Thanks to
    Dan Williams and Colin Walters for their assistance in spotting this.
    upstream bug fdo #18961)
- Draw the rounding box inside the icon bounds (benzea) #567
- Add Dismiss option to the palette of finished transfers #484
- Resume-by-default uses open with, not just open #547
- Set Pippy as the default for opening python files #287
- Remove duplicates from the activities submenu #497
- Remove transfer icon from frame when the local user cancels it #483
- Restore the icon size after a layout change #157
- enable logout option

---

diff --git a/.cvsignore b/.cvsignore
index 6b6d07b..0a0b6a2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sugar-0.84.0-gitd3a0839735.tar.bz2
+sugar-0.84.1.tar.bz2
diff --git a/enable-logout.patch b/enable-logout.patch
new file mode 100644
index 0000000..c13feeb
--- /dev/null
+++ b/enable-logout.patch
@@ -0,0 +1,13 @@
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index dc7104d..fba89ff 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -173,7 +173,7 @@
+       <applyto>/desktop/sugar/show_logout</applyto>
+       <owner>sugar</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+       <!-- FIXME: Enable these after string freeze is over
+         <short>Show Log out</short>
diff --git a/sources b/sources
index 7762734..a409e7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97b28648406392d6fd1ddd07d5c6c700  sugar-0.84.0-gitd3a0839735.tar.bz2
+2ce7aa1d33576a8f4fa8204437553c68  sugar-0.84.1.tar.bz2
diff --git a/sugar.spec b/sugar.spec
index 082a436..64dbe11 100644
--- a/sugar.spec
+++ b/sugar.spec
@@ -5,15 +5,15 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.0
-#Release: 1%{?dist}
-Release: 2.%{alphatag}%{?dist}
+Version: 0.84.1
+Release: 1%{?dist}
+#Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
 # cd sugar
 # git-checkout %{commitid}
-Source0: %{name}-%{version}-git%{commitid}.tar.bz2
-#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,8 @@ Requires: openssh
 
 Obsoletes: sugar-journal <= 99
 
+Patch1: enable-logout.patch
+
 %description
 
 Sugar provides simple yet powerful means of engaging young
@@ -71,6 +73,7 @@ multiple instances of sugar.
 
 %prep
 %setup -q
+%patch1 -p1 -b .logout
 
 %build
 %configure
@@ -140,6 +143,20 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sun Mar 22 2009 Simon Schampijer <simon@schampijer.de> - 0.84.1-1
+- Update to latest NM-User config file (same as nm-applet)
+- Fix nondeterministic denials for no-interface messages #575
+  (Thanks to Dan Williams and Colin Walters for their assistance
+  in spotting this. upstream bug fdo #18961)
+- Draw the rounding box inside the icon bounds (benzea) #567
+- Add Dismiss option to the palette of finished transfers #484
+- Resume-by-default uses open with, not just open #547
+- Set Pippy as the default for opening python files #287
+- Remove duplicates from the activities submenu #497
+- Remove transfer icon from frame when the local user cancels it #483
+- Restore the icon size after a layout change #157
+- enable logout option
+
 * Wed Mar 18 2009 Simon Schampijer <simon@schampijer.de> - 0.84.0-2.20090318gitd3a0839735
 - git snapshot