rpms/rainbow/OLPC-2 .cvsignore, 1.5, 1.6 rainbow.spec, 1.6, 1.7 sources, 1.6, 1.7

Fri Nov 2 00:46:46 UTC 2007

Author: mstone

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

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Remove olpc-update
- Remove dependency on pyvserver



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	27 Aug 2007 22:44:09 -0000	1.5
+++ .cvsignore	2 Nov 2007 00:46:12 -0000	1.6
@@ -1 +1 @@
-rainbow-20070827gitf78050.tar.bz2
+rainbow-0.7.0.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/rainbow.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rainbow.spec	27 Aug 2007 22:44:09 -0000	1.6
+++ rainbow.spec	2 Nov 2007 00:46:12 -0000	1.7
@@ -3,20 +3,19 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        1.0
-Release:        0.5.20070827gitf78050%{dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        The OLPC security service
 
 Group:          System Environment/Daemons
 License:        MIT
-URL:            http://dev.laptop.org/git/security
-Source0:        http://dev.laptop.org/~mburns/rainbow-20070827gitf78050.tar.bz2
+URL:            http://wiki.laptop.org/go/Rainbow
+Source0:        http://dev.laptop.org/~mstone/releases/SOURCES/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       dbus
 Requires:       python-setuptools
-Requires:       python-sqlalchemy
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 
@@ -24,7 +23,7 @@
 The service component of the OLPC Bitfrost security platform.
 
 %prep
-%setup -q -n Rainbow
+%setup -q -n Rainbow-%{version}
 
 
 %build
@@ -34,14 +33,38 @@
 %install
 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/%{_sysconfdir}/init.d/
+install etc/init.d/rainbow $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rainbow
+
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d
+install -m 644 rainbow/conf/session-olpc.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/session-olpc.conf
 install -m 644 rainbow/conf/org.laptop.security.Rainbow.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/org.laptop.security.Rainbow.conf
+
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/rainbow
-install -m 600 rainbow/conf/rainbow.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rainbow/rainbow.conf
-chmod 744 $RPM_BUILD_ROOT/%{_sbindir}/rainbow
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/rainbow
-install -m 644 rainbow/conf/session-olpc.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1 
- 
+install -m 644 rainbow/conf/rainbow.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rainbow/rainbow.conf
+
+# Set up logging
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/log/rainbow
+
+# Set up the spool
+install -d -m 700 $RPM_BUILD_ROOT/%{_localstatedir}/rainbow
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/rainbow/scratch
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/rainbow/uidpool
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/rainbow/gidpool
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/rainbow/gid
+
+
+%post
+chkconfig --add rainbow
+
+
+%preun
+chkconfig --del rainbow
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,34 +74,70 @@
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.laptop.security.Rainbow.conf
 %config(noreplace) %{_sysconfdir}/rainbow/rainbow.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/session-olpc.conf
-%doc README COPYING
+%doc README COPYING AUTHORS
 %dir %{python_sitelib}/rainbow
 %{python_sitelib}/rainbow/*
-%{_sbindir}/rainbow
+%{_sbindir}/rainbow-daemon
+%{_sysconfdir}/init.d/rainbow
+%dir %{_localstatedir}/rainbow
+%dir %{_localstatedir}/log/rainbow
 %dir %{python_sitelib}/Rainbow-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/Rainbow-%{version}-py%{python_version}.egg-info/*
 
 %changelog
-* Mon Aug 27 2007 Michael Burns <maburns at gmail.com> - 1.0-0.5.20070827gitf78050
-- Work around limitations of outdated util-vserver-lib
-* Mon Aug 24 2007 Michael Burns <maburns at gmail.com> - 1.0-0.4.20070824git7554a
-- Latest rainbow snapshot
-- DBus improvements
-* Mon Aug 13 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.3.20070814gitf1116a
-- Bump rainbow snapshot.
-* Mon Aug 13 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.3.20070813git726b3b
-- Add dependency on python-sqlalchemy.
-* Mon Aug 13 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.2.20070813git726b3b
-- Update snapshot of rainbow.
+* Thu Nov 01 2007 Michael Stone <michael at laptop.org> - 0.7.0-1.olpc2
+- Remove olpc-update
+- Remove dependency on pyvserver
+
+* Thu Sep 27 2007 Michael Stone <michael at laptop.org> - 0.6.7-1
+- Add /etc/init.d/rainbow-daemon
+
+* Thu Sep 27 2007 Michael Stone <michael at laptop.org> - 0.6.6-1
+- Bump revision number.
+
+* Mon Sep 24 2007 Michael Stone <michael at laptop.org> - 0.6.5-1
+- Bump revision number.
+
+* Mon Sep 24 2007 Michael Stone <michael at laptop.org> - 0.6.4-1
+- Bump revision number.
+- Add dependency on olpccontents
+
+* Wed Sep 19 2007 Michael Stone <michael at laptop.org> - 0.6.3-1
+- Fix version/release numbering.
+- Correct source line.
+
+* Wed Sep 19 2007 Michael Stone <michael at laptop.org> - 1.0-0.6.2
+- Bump revision number.
+- Fix installation permissions on executable scripts.
+- Add a olpc-update and olpc-update-rsync scripts for performing incremental OS
+  updates.
+
+* Mon Sep 10 2007 Michael Stone <michael at laptop.org> - 1.0-0.6.1
+- Bump revision number.
+
+* Fri Sep 07 2007 Michael Stone <michael at laptop.org> - 1.0-0.6
+- 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. 
+- Add a build-number field to the release identifier.
+
+* Thu Aug 30 2007 Michael Stone <michael at laptop.org> - 1.0-0.2.20070830git014607
+- Add a new installed binary for runninng updaters.
+
 * Mon Aug 13 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.2.20070731gitde262e
 - Add dist tag to Release.
+
 * Mon Aug 13 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.1.20070731gitde262e
 - Remove arch-specific variables.
 - Package only needed folders from site-pacakges.
 - Use macros in a few more places.
+
 * Tue Jul 31 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.0.20070731gitde262e
 - Bump to latest version of Rainbow.
+
 * Mon Jul 30 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.0.20070730git9a7744
 - Adding DBus session bus config and bumping to new snapshop of Rainbow.
+
 * Tue Jul 24 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.0.20070723git639686
 - Initial version of this spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2007 22:44:09 -0000	1.6
+++ sources	2 Nov 2007 00:46:12 -0000	1.7
@@ -1 +1 @@
-c573e0e48146ce9ec3333d7038884995  rainbow-20070827gitf78050.tar.bz2
+41a6e6cfd56dfb152b610f3e45e7857c  rainbow-0.7.0.tar.bz2


