[olpc-utils/f16] v2.0.0

[Daniel Drake]

commit 3804096d6c7522f77c60b09af91cf0faa796712a
Author: Daniel Drake <dsd at laptop.org>
Date:   Sat Oct 1 01:08:26 2011 +0100

    v2.0.0

 .gitignore             |    1 +
 olpc-configure.service |   14 --------------
 olpc-utils.spec        |   30 ++++++++++++++++++++++--------
 sources                |    2 +-
 4 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3c6f1a..20cc253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ olpc-utils-1.0.27.tar.bz2
 /olpc-utils-1.3.3.tar.bz2
 /olpc-utils-1.3.4.tar.bz2
 /olpc-utils-1.3.5.tar.bz2
+/olpc-utils-2.0.0.tar.bz2
diff --git a/olpc-utils.spec b/olpc-utils.spec
index 7226e92..9436509 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,12 +1,11 @@
 Name:       olpc-utils
-Version:    1.3.5
+Version:    2.0.0
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://wiki.laptop.org/go/Olpc-utils
 Group:      System Environment/Base
 License:    GPLv2+
 Source0:    http://dev.laptop.org/pub/source/%{name}-%{version}.tar.bz2
-Source1:    olpc-configure.service
 
 # for olpc-dm
 BuildRequires: ConsoleKit-devel
@@ -18,8 +17,6 @@ Requires:      systemd-units
 
 # for olpc-test-devkey
 Requires:      bitfrost
-#comment out for the moment as olpcupdate isn't in Fedora mainline
-#Requires:   olpcupdate >= 2.10
 
 # for modprobe.d
 Requires:      module-init-tools
@@ -36,6 +33,9 @@ Requires: xorg-x11-server-Xorg
 # for /lib/udev
 Requires: udev
 
+# for /usr/share/glib-2.0/schemas and glib-compile-schemas
+Requires: glib2
+
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -51,13 +51,10 @@ make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
 make -f Makefile.build install DESTDIR=%{buildroot}
-rm -f %{buildroot}/etc/init/ttySx.conf # now provided by systemd
-mv %{buildroot}/etc/rc.d/init.d/olpc-configure %{buildroot}/usr/sbin
 %ifarch x86_64
 mv %{buildroot}/usr/lib %{buildroot}/usr/lib64
 %endif
 
-install -m 644 -D %{SOURCE1} %{buildroot}/lib/systemd/system/olpc-configure.service
 
 %post
 if [ $1 -eq 1 ]; then
@@ -66,6 +63,7 @@ if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add diskspacerecover
 fi
 
+
 %preun
 if [ $1 = 0 ]; then
 	/bin/systemctl disable olpc-configure.service
@@ -73,6 +71,17 @@ if [ $1 = 0 ]; then
     /sbin/chkconfig --del diskspacerecover
 fi
 
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -88,6 +97,7 @@ fi
 %{_bindir}/olpc-hwinfo
 /lib/systemd/system/*
 %{_datadir}/olpc-utils
+%{_datadir}/glib-2.0/schemas/*
 %{_datadir}/X11/xorg.conf.d/*
 %{_libdir}/pm-utils/sleep.d/00xo
 /lib/udev/device-tree-val
@@ -95,7 +105,6 @@ fi
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_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}/udev/rules.d/10-olpc-sd.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-net.rules
@@ -108,6 +117,11 @@ fi
 %config(noreplace) %{_sysconfdir}/modprobe.d/olpc-psmouse.conf
 
 %changelog
+* Sat Oct  1 2011 Daniel Drake <dsd at laptop.org> - 2.0.0-1
+- Remove outdated bits
+- Update for Fedora 16
+- Add GNOME 3 gsettings overrides for OLPC
+
 * Fri Sep 30 2011 Daniel Drake <dsd at laptop.org> - 1.3.5-1
 - Enable XO-1.75 hardware cursor and screen rotation
 - Fix permissions on screen/lockdev runtime directories
diff --git a/sources b/sources
index f5e3e8d..4575d34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59929d0ecf1c120a9e914d7e1a769997  olpc-utils-1.3.5.tar.bz2
+2ce17d8bcd46efe2a450df51d4184c9c  olpc-utils-2.0.0.tar.bz2