rpms/rainbow/F-9 .cvsignore, 1.6, 1.7 rainbow.spec, 1.6, 1.7 sources, 1.6, 1.7

[Michael Stone (mstone)]

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7106

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Bobby Powers (1):
    dlo#6797: Fix module preloading on F9-based builds.
- C. Scott Ananian (1):
    The sugar session.info file was removed; don't try to inject it.
- Michael Stone (1):
    Drop the rainbow initscript.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jul 2008 00:20:06 -0000	1.6
+++ .cvsignore	2 Aug 2008 21:34:12 -0000	1.7
@@ -1 +1 @@
-rainbow-0.7.17.tar.bz2
+rainbow-0.7.18.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/rainbow.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rainbow.spec	25 Jul 2008 00:20:06 -0000	1.6
+++ rainbow.spec	2 Aug 2008 21:34:12 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.17
+Version:        0.7.18
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -39,8 +39,8 @@
 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
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/event.d/
+install etc/event.d/rainbow $RPM_BUILD_ROOT/%{_sysconfdir}/event.d/rainbow
 
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.perms.d
@@ -59,23 +59,6 @@
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/olpc-security
 
 
-%post
-/sbin/chkconfig --add rainbow
-
-
-%preun
-if [ "$1" -eq 0 ]; then
-  /sbin/service rainbow stop > /dev/null 2>&1 || :
-  /sbin/chkconfig --del rainbow
-fi
-exit 0
-
-%postun
-if [ "$1" -gt 0 ]; then
-  /sbin/service rainbow restart > /dev/null 2>&1 || :
-fi
-exit 0
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,13 +74,21 @@
 %{python_sitelib}/rainbow/*
 %{_sbindir}/rainbow-daemon
 %{_sbindir}/rainbow-replay-spool
-%{_sysconfdir}/init.d/rainbow
+%{_sysconfdir}/event.d/rainbow
 %config(noreplace) %{_sysconfdir}/logrotate.d/rainbow
 %ghost %{_localstatedir}/log/rainbow
 %dir %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* Sat Aug 02 2008 Michael Stone <michael at laptop.org> - 0.7.18-1.olpc3
+- Bobby Powers (1):
+    dlo#6797: Fix module preloading on F9-based builds.
+- C. Scott Ananian (1):
+    The sugar session.info file was removed; don't try to inject it.
+- Michael Stone (1):
+    Drop the rainbow initscript.
+
 * Mon Jul 24 2008 Michael Stone <michael at laptop.org> - 0.7.17-1.olpc3
 - Michael Stone (1):
     dlo#7587: Make logging and pid-file writing optional.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jul 2008 00:20:06 -0000	1.6
+++ sources	2 Aug 2008 21:34:12 -0000	1.7
@@ -1 +1 @@
-0abea238443ee676ec3041c7d37b1cdf  rainbow-0.7.17.tar.bz2
+a6d408e96abbbbe39b96ccaecbe58dc7  rainbow-0.7.18.tar.bz2