[olpc-utils/f17] v2.0.5

[Daniel Drake]

commit c11c43f45d766e62662b3cae2d7156a20d4aed93
Author: Daniel Drake <dsd at laptop.org>
Date:   Mon Mar 26 11:37:47 2012 -0600

    v2.0.5

 olpc-utils.spec |   22 ++++++++++++----------
 sources         |    2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/olpc-utils.spec b/olpc-utils.spec
index fc53924..0bffba8 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    2.0.4
+Version:    2.0.5
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://wiki.laptop.org/go/Olpc-utils
@@ -52,11 +52,14 @@ make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 %install
 make -f Makefile.build install DESTDIR=%{buildroot}
 %ifarch x86_64 s390x ppc64 sparc64
+# make _libdir happy
 mv %{buildroot}/usr/lib %{buildroot}/usr/lib64
+
+# but revert slightly to please _unitdir
+mkdir -p %{buildroot}/usr/lib
+mv %{buildroot}/usr/lib64/systemd %{buildroot}/usr/lib
 %endif
 
-mkdir -p %{buildroot}/usr/lib/systemd/system/
-mv %{buildroot}/lib/systemd/system/* %{buildroot}/usr/lib/systemd/system
 
 %post
 if [ $1 -eq 1 ]; then
@@ -108,23 +111,22 @@ fi
 %{_datadir}/X11/xorg.conf.d/*
 %{_libdir}/pm-utils/sleep.d/00xo
 /lib/udev/device-tree-val
-/lib/udev/rules.d/96-olpckeymap.rules
+/lib/udev/olpc*
+/lib/udev/rules.d/*
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/rc.d/init.d/diskspacecheck
 %{_sysconfdir}/rc.d/init.d/diskspacerecover
 %config(noreplace) %{_sysconfdir}/motd.olpc
-%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}/udev/rules.d/10-olpc-galcore.rules
-%config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-mmp2rtc.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
 %config(noreplace) %{_sysconfdir}/skel/.config/autostart/imsettings-start.desktop
 %config(noreplace) %{_sysconfdir}/pam.d/olpc-login
 #%config(noreplace) %{_sysconfdir}/modprobe.d/olpc-psmouse.conf
 
 %changelog
+* Mon Mar 26 2012 Daniel Drake <dsd at laptop.org> - 2.0.5-1
+- Various bug fixes for mouse, network, XO-1.75 video, etc.
+
 * Mon Mar 19 2012 Daniel Drake <dsd at laptop.org> - 2.0.4-1
 - Bug fixes, and interaction with OLPC's plymouth boot animation
 
diff --git a/sources b/sources
index df498ea..3f408cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca8bf62938a996bf93ad825fbbc479d7  olpc-utils-2.0.4.tar.bz2
+42486674ac0644b2960c94bd6833cb7d  olpc-utils-2.0.5.tar.bz2