[olpc-utils] v1.2.1

[Daniel Drake]

commit 21749342f536e09ae398002da67acefd8d268942
Author: Daniel Drake <dsd at laptop.org>
Date:   Tue Sep 21 18:06:43 2010 +0100

    v1.2.1

 .gitignore      |    1 +
 olpc-utils.spec |   24 ++++++++++++------------
 sources         |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f868f9..2a0db39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ olpc-utils-1.0.27.tar.bz2
 /olpc-utils-1.0.28.tar.bz2
 /olpc-utils-1.0.29.tar.bz2
 /olpc-utils-1.2.0.tar.bz2
+/olpc-utils-1.2.1.tar.bz2
diff --git a/olpc-utils.spec b/olpc-utils.spec
index ae88c8d..3e3b418 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.2.0
+Version:    1.2.1
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -8,7 +8,8 @@ License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	systemd
+# for new event location
+Conflicts: upstart < 0.6.0
 
 # for olpc-dm
 BuildRequires:  ConsoleKit-devel
@@ -24,6 +25,10 @@ Requires:   /usr/bin/find
 # for modprobe.d
 Requires:	module-init-tools
 
+# for SiSUSB2VGA support
+Requires: xorg-x11-server-Xephyr
+Requires: xorg-x11-drv-sisusb
+
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -43,16 +48,14 @@ make -f Makefile.build install DESTDIR=%{buildroot}
 
 %post
 if [ $1 -eq 1 ]; then
-	/bin/systemctl enable olpc-configure.service
-	/bin/systemctl enable getty at ttyS0.service
+	/sbin/chkconfig --add olpc-configure
 	/sbin/chkconfig --add diskspacecheck
 	/sbin/chkconfig --add diskspacerecover
 fi
 
 %preun
 if [ $1 = 0 ]; then
-	/bin/systemctl disable olpc-configure.service
-	/bin/systemctl disable getty at ttyS0.service
+    /sbin/chkconfig --del olpc-configure
     /sbin/chkconfig --del diskspacecheck
     /sbin/chkconfig --del diskspacerecover
 fi
@@ -63,7 +66,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_sbindir}/olpc-configure
 %{_sbindir}/olpc-dm
 %{_bindir}/olpc-logbat
 %{_bindir}/olpc-session
@@ -72,20 +74,18 @@ rm -rf %{buildroot}
 %{_bindir}/olpc-audit
 %{_bindir}/olpc-test-devkey
 %{_bindir}/olpc-solar-log
-/lib/systemd/system/*
 %{_sysconfdir}/profile.d/zzz_olpc.sh
+%{_sysconfdir}/rc.d/init.d/olpc-configure
 %{_sysconfdir}/rc.d/init.d/diskspacecheck
 %{_sysconfdir}/rc.d/init.d/diskspacerecover
 %config(noreplace) %{_sysconfdir}/hal/fdi/information/30-keymap-olpc.fdi
 %config(noreplace) %{_sysconfdir}/motd.olpc
+%config(noreplace) %{_sysconfdir}/init/ttyS0.conf
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-sd.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-net.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/20-olpc-rfkill.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/30-olpc-wedo.rules
-%config(noreplace) %{_sysconfdir}/X11/xorg-dcon.conf
-%config(noreplace) %{_sysconfdir}/X11/xorg-xo1.5-dcon.conf
-%config(noreplace) %{_sysconfdir}/X11/xorg-emu.conf
-%config(noreplace) %{_sysconfdir}/X11/xorg-vmware.conf
+%config(noreplace) %{_sysconfdir}/X11/*.conf
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
 %config(noreplace) %{_sysconfdir}/skel/.config/autostart/imsettings-start.desktop
 %config(noreplace) %{_sysconfdir}/skel/.config/autostart/batterymon.desktop
diff --git a/sources b/sources
index b168706..1a3b05c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41f8883422c9f731a8bcdef20d1a0114  olpc-utils-1.2.0.tar.bz2
+5f501b90912fd7ffd055ae46557e3496  olpc-utils-1.2.1.tar.bz2