rpms/rainbow/OLPC-2 .cvsignore, 1.11, 1.12 rainbow.spec, 1.12, 1.13 sources, 1.12, 1.13

[Michael Stone (mstone)]

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30835

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Move Rainbow's spool-dir from /activities to $HOME/isolation/1/; works
  around http://dev.laptop.org/ticket/5033
- Provide a spool-replay script for use by olpc-configure.
- Construct spools at run-time rather than via rpm.
- Remove our runtime-dependency on python-setuptools.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Dec 2007 05:33:16 -0000	1.11
+++ .cvsignore	5 Jan 2008 03:21:02 -0000	1.12
@@ -1 +1 @@
-rainbow-0.7.5.tar.bz2
+rainbow-0.7.6.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/rainbow.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rainbow.spec	20 Dec 2007 05:33:16 -0000	1.12
+++ rainbow.spec	5 Jan 2008 03:21:02 -0000	1.13
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.5
+Version:        0.7.6
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -15,7 +15,6 @@
 
 BuildArch:      noarch
 Requires:       dbus
-Requires:       python-setuptools
 Requires:       sugar >= 0.65-0.77.20071105git.0a9676171d
 Requires:       ipython
 BuildRequires:  python-devel
@@ -36,7 +35,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT/%{_sbindir}/rainbow-daemon
+install -d $RPM_BUILD_ROOT/%{_sbindir}
+install -m 755 bin/rainbow-replay-spool $RPM_BUILD_ROOT/%{_sbindir}/rainbow-replay-spool
+install -m 755 bin/rainbow-daemon       $RPM_BUILD_ROOT/%{_sbindir}/rainbow-daemon
 
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/
 install etc/init.d/rainbow $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rainbow
@@ -54,15 +55,6 @@
 touch $RPM_BUILD_ROOT/%{_localstatedir}/log/rainbow
 chmod 644 $RPM_BUILD_ROOT/%{_localstatedir}/log/rainbow
 
-# Set up the spool
-install -d $RPM_BUILD_ROOT/activities/
-install -d $RPM_BUILD_ROOT/activities/uid_pool
-install -d $RPM_BUILD_ROOT/activities/gid_pool
-install -d $RPM_BUILD_ROOT/activities/bundle_id_to_gid
-install -d $RPM_BUILD_ROOT/activities/gid_to_data_dir
-install -d $RPM_BUILD_ROOT/activities/uid_to_instance_dir
-install -d $RPM_BUILD_ROOT/activities/uid_to_home_dir
-
 # Turn rainbow on by default.
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/olpc-security
 
@@ -99,20 +91,20 @@
 %dir %{python_sitelib}/rainbow
 %{python_sitelib}/rainbow/*
 %{_sbindir}/rainbow-daemon
-%{_sbindir}/rainbow-inject
+%{_sbindir}/rainbow-replay-spool
 %{_sysconfdir}/init.d/rainbow
 %ghost %{_localstatedir}/log/rainbow
-%dir /activities
-%dir /activities/uid_pool
-%dir /activities/gid_pool
-%dir /activities/bundle_id_to_gid
-%dir /activities/gid_to_data_dir
-%dir /activities/uid_to_instance_dir
-%dir /activities/uid_to_home_dir
 %dir %{python_sitelib}/Rainbow-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/Rainbow-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Fri Jan 04 2008 Michael Stone <michael at laptop.org> - 0.7.6-1.olpc2
+- Move Rainbow's spool-dir from /activities to $HOME/isolation/1/; works
+  around http://dev.laptop.org/ticket/5033
+- Provide a spool-replay script for use by olpc-configure.
+- Construct spools at run-time rather than via rpm.
+- Remove our runtime-dependency on python-setuptools.
+
 * Wed Dec 19 2007 Michael Stone <michael at laptop.org> - 0.7.5-1.olpc2
 - Install /etc/olpc-security by default.
 - Improve installation-scripts to handle updates. (thanks, Mako).
@@ -120,7 +112,7 @@
 
 * Sat Nov 10 2007 Michael Stone <michael at laptop.org> - 0.7.4-1.olpc2
 - Explicitly specify the working directory of launched activities.
-- Reduce permissions on activity home dirs. 
+- Reduce permissions on activity home dirs.
 - Fix the strace option.
 - Add ipython dependency so we get detailed tracebacks on failure.
 - Make owner.key.pub available to activities.
@@ -174,7 +166,7 @@
 - Correct ChangeLog formatting.
 
 * Thu Aug 31 2007 Michael Stone <michael at laptop.org> - 1.0-0.4.4.20070831gita7c737
-- Record run-time dependencies on python-sqlalchemy and pyvserver. 
+- Record run-time dependencies on python-sqlalchemy and pyvserver.
 - Add a build-number field to the release identifier.
 
 * Thu Aug 30 2007 Michael Stone <michael at laptop.org> - 1.0-0.2.20070830git014607


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Dec 2007 05:33:16 -0000	1.12
+++ sources	5 Jan 2008 03:21:02 -0000	1.13
@@ -1 +1 @@
-0daece90be06b319b99764b361726ff2  rainbow-0.7.5.tar.bz2
+c2765fb51d7411b24c7617a23057319d  rainbow-0.7.6.tar.bz2