rpms/sugar-datastore/OLPC-2 dlo-5033.patch, NONE, 1.1 sugar-datastore.spec, 1.56, 1.57

[Bernardo Innocenti (bernie)]

Author: bernie

Update of /cvs/pkgs/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31311

Modified Files:
	sugar-datastore.spec 
Added Files:
	dlo-5033.patch 
Log Message:
* Fri Jan 04 2008 Bernardo Innocenti <bernie at codewiz.org> - 0.7.2-2
- dlo#5033: Rainbow spool moved from /activities to $HOME/isolation/1
- Correct license tag from GPL to GPLv2+
- Include dist tag in release version


dlo-5033.patch:

--- NEW FILE dlo-5033.patch ---
diff -Nrup sugar-datastore-0.7.2.orig/src/olpc/datastore/backingstore.py sugar-datastore-0.7.2/src/olpc/datastore/backingstore.py
--- sugar-datastore-0.7.2.orig/src/olpc/datastore/backingstore.py	2007-12-19 19:30:21.000000000 +0100
+++ sugar-datastore-0.7.2/src/olpc/datastore/backingstore.py	2008-01-04 23:00:40.000000000 +0100
@@ -376,7 +376,7 @@ class FileBackingStore(BackingStore):
         if use_instance_dir:
             if not self.current_user_id:
                 raise ValueError("Couldn't determine the current user uid.")
-            base = os.path.join('/activities', 'uid_to_instance_dir',
+            base = os.path.join(os.environ['HOME'], 'isolation', '1', 'uid_to_instance_dir',
                                 str(self.current_user_id))
         else:
             profile = os.environ.get('SUGAR_PROFILE', 'default')


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sugar-datastore.spec	21 Dec 2007 12:05:57 -0000	1.56
+++ sugar-datastore.spec	5 Jan 2008 03:36:06 -0000	1.57
@@ -2,13 +2,14 @@
 
 Name: sugar-datastore
 Version: 0.7.2
-Release: 1
+Release: 2%{?dist}
 Summary: Sugar Datastore
 
 Group: Development/Libraries
-License: GPL
+License: GPLv2+
 URL: http://dev.laptop.org/
 Source0: http://dev.laptop.org/pub/sugar/release/sugar-datastore/sugar-datastore-%{version}.tar.bz2
+Patch0: dlo-5033.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -47,6 +49,11 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Jan 04 2008 Bernardo Innocenti <bernie at codewiz.org> - 0.7.2-2
+- dlo#5033: Rainbow spool moved from /activities to $HOME/isolation/1
+- Correct license tag from GPL to GPLv2+
+- Include dist tag in release version
+
 * Wed Dec 19 2007 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.7.2-1
 - #2545 Clean up correctly when unmounting a non-present removable device.