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

[Michael Stone (mstone)]

Author: mstone

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

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Install /etc/olpc-security by default.
- Improve installation-scripts to handle updates. (thanks, Mako).
- Cause rainbow-daemon to request utf8 strings, fixes http://dev.laptop.org/ticket/5011.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Nov 2007 09:01:17 -0000	1.10
+++ .cvsignore	20 Dec 2007 05:33:16 -0000	1.11
@@ -1 +1 @@
-rainbow-0.7.4.tar.bz2
+rainbow-0.7.5.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/rainbow.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rainbow.spec	10 Nov 2007 09:01:17 -0000	1.11
+++ rainbow.spec	20 Dec 2007 05:33:16 -0000	1.12
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.7.4
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        The OLPC security service
 
@@ -63,14 +63,26 @@
 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
+
 
 %post
-chkconfig --add rainbow
+/sbin/chkconfig --add rainbow
 
 
 %preun
-chkconfig --del rainbow
-
+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
@@ -78,6 +90,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_sysconfdir}/olpc-security
 %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
@@ -100,6 +113,11 @@
 %{python_sitelib}/Rainbow-%{version}-py%{python_version}.egg-info/*
 
 %changelog
+* 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).
+- Cause rainbow-daemon to request utf8 strings, fixes http://dev.laptop.org/ticket/5011.
+
 * 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. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/OLPC-2/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Nov 2007 09:01:17 -0000	1.11
+++ sources	20 Dec 2007 05:33:16 -0000	1.12
@@ -1 +1 @@
-e39bbcc3faf708f8ba73c7d582473a28  rainbow-0.7.4.tar.bz2
+0daece90be06b319b99764b361726ff2  rainbow-0.7.5.tar.bz2