[olpc-utils] v1.2.0

[Daniel Drake]

commit 189286fb36a5f4dbc9a78dde2947814ac2e9a2fe
Author: Daniel Drake <dsd at laptop.org>
Date:   Mon Sep 13 13:23:17 2010 -0600

    v1.2.0

 .gitignore      |    1 +
 olpc-utils.spec |   30 +++++++++++++++++-------------
 sources         |    2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ec583a..3f868f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ olpc-utils-1.0.25.tar.bz2
 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
diff --git a/olpc-utils.spec b/olpc-utils.spec
index 18d0e47..ae88c8d 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.29
+Version:    1.2.0
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -8,6 +8,8 @@ License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:	systemd
+
 # for olpc-dm
 BuildRequires:  ConsoleKit-devel
 Requires:       /usr/bin/xauth
@@ -22,9 +24,6 @@ Requires:   /usr/bin/find
 # for modprobe.d
 Requires:	module-init-tools
 
-# for new event location
-Conflicts: upstart < 0.6.0
-
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -42,17 +41,18 @@ make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 rm -rf %{buildroot}
 make -f Makefile.build install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/%{_sysconfdir}/init
-mv %{buildroot}/%{_sysconfdir}/event.d/ttyS0 %{buildroot}/%{_sysconfdir}/init/ttyS0.conf
-
 %post
-/sbin/chkconfig --add olpc-configure
-/sbin/chkconfig --add diskspacecheck
-/sbin/chkconfig --add diskspacerecover
+if [ $1 -eq 1 ]; then
+	/bin/systemctl enable olpc-configure.service
+	/bin/systemctl enable getty at ttyS0.service
+	/sbin/chkconfig --add diskspacecheck
+	/sbin/chkconfig --add diskspacerecover
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/chkconfig --del olpc-configure
+	/bin/systemctl disable olpc-configure.service
+	/bin/systemctl disable getty at ttyS0.service
     /sbin/chkconfig --del diskspacecheck
     /sbin/chkconfig --del diskspacerecover
 fi
@@ -63,6 +63,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING
+%{_sbindir}/olpc-configure
 %{_sbindir}/olpc-dm
 %{_bindir}/olpc-logbat
 %{_bindir}/olpc-session
@@ -71,13 +72,12 @@ 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
@@ -93,6 +93,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/modprobe.d/olpc-psmouse.conf
 
 %changelog
+* Mon Sep 13 2010 Daniel Drake <dsd at laptop.org> - 1.2.0-1
+- update for systemd
+- remove stale X MigrationHeuristic rendering bug workaround
+
 * Thu Aug 26 2010 Daniel Drake <dsd at laptop.org> - 1.0.29-1
 - olpc-session: set SUGAR_SCALING for Sugar 0.90
 
diff --git a/sources b/sources
index 86f7f90..b168706 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee7327d3b9a38c5d08ecb8d60706dd12  olpc-utils-1.0.29.tar.bz2
+41f8883422c9f731a8bcdef20d1a0114  olpc-utils-1.2.0.tar.bz2