rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.10, 1.11 initscripts.spec, 1.155, 1.156

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
* Fri Oct 12 2007  Bernardo Innocenti <bernie at codewiz.org> - 8.54.1-12
- Require olpc-utils for olpc-dm
- olpc-dm now lives in /usr/sbin


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- initscripts-8.54.1-olpc.patch	15 Oct 2007 19:07:57 -0000	1.10
+++ initscripts-8.54.1-olpc.patch	15 Oct 2007 21:46:53 -0000	1.11
@@ -23,4 +23,4 @@
  
  # Run xdm in runlevel 5
 -x:5:respawn:/etc/X11/prefdm -nodaemon
-+x:5:once:/sbin/olpc-dm
++x:5:once:/usr/sbin/olpc-dm


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- initscripts.spec	15 Oct 2007 19:07:57 -0000	1.155
+++ initscripts.spec	15 Oct 2007 21:46:53 -0000	1.156
@@ -21,6 +21,7 @@
 Requires: /etc/redhat-release, dev
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 078-1
+Requires: olpc-utils >= 0.20
 Conflicts: mkinitrd < 4.0, kernel < 2.6.12
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
@@ -212,8 +213,12 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Fri Oct 12 2007  Bernardo Innocenti <bernie at codewiz.org> - 8.54.1-12
+- Require olpc-utils for olpc-dm
+- olpc-dm now lives in /usr/sbin
+
 * Fri Oct 12 2007  Bernardo Innocenti <bernie at codewiz.org> - 8.54.1-11
-- Drop olpc-dm: it is now in olpc-dm.
+- Drop olpc-dm: it is now in olpc-dm
 
 * Fri Oct 12 2007  Bernardo Innocenti <bernie at codewiz.org> - 8.54.1-10
 - Don't bind-mount /home/olpc/.Xauthority: unbreaks alternate boot