rpms/olpc-utils/F-11 .cvsignore, 1.2, 1.3 olpc-utils.spec, 1.7, 1.8 sources, 1.3, 1.4 diskspace.patch, 1.1, NONE dot-xsession-example, 1.1, NONE olpc-login, 1.1, NONE olpc-utils-dbus.patch, 1.1, NONE olpc-utils-python2.6.patch, 1.1, NONE olpc-utils-touchpad.patch, 1.1, NONE xorg-dcon.conf, 1.1, NONE

[Daniel Drake]

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16067

Modified Files:
	.cvsignore olpc-utils.spec sources 
Removed Files:
	diskspace.patch dot-xsession-example olpc-login 
	olpc-utils-dbus.patch olpc-utils-python2.6.patch 
	olpc-utils-touchpad.patch xorg-dcon.conf 
Log Message:
Update to latest version, including XO-1.5 support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2008 01:18:00 -0000	1.2
+++ .cvsignore	29 Jun 2009 15:38:01 -0000	1.3
@@ -1 +1 @@
-olpc-utils-0.71.tar.bz2
+olpc-utils-1.0.2.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- olpc-utils.spec	26 Feb 2009 21:01:43 -0000	1.7
+++ olpc-utils.spec	29 Jun 2009 15:38:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       olpc-utils
-Version:    0.89
-Release:    10%{?dist}
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -8,25 +8,20 @@ License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: olpc-utils-dbus.patch
-Patch2: olpc-utils-python2.6.patch
-
-BuildRequires:  python-devel
-
 # for olpc-dm
-BuildRequires:  pam-devel
-Requires:       pam
+BuildRequires:  ConsoleKit-devel
+Requires:       /usr/bin/xauth
 
 # for olpc-configure
 Requires:   /usr/bin/find
 
-# for become_root
-Requires:   /bin/su
-
 # for olpc-test-devkey
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
+# for olpc-session
+Requires:   /usr/share/sugar/data
+
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -35,18 +30,14 @@ becoming root, and cleaning the datastor
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p0
 
 %build
-make -f Makefile.build %{?_smp_mflags}
+make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 rm -rf %{buildroot}
 make -f Makefile.build install DESTDIR=%{buildroot}
-# XXX fix upstream package
-rm -rf %{buildroot}/etc/hal/fdi/policy
 
 %post
 /sbin/chkconfig --add olpc-configure
@@ -64,12 +55,8 @@ fi
 rm -rf %{buildroot}
 
 %files
-
-%doc COPYING
-
 %defattr(-,root,root,-)
-
-%{_sbindir}/setolpckeys
+%doc COPYING
 %{_sbindir}/olpc-dm
 %{_bindir}/olpc-logbat
 %{_bindir}/olpc-session
@@ -77,22 +64,25 @@ rm -rf %{buildroot}
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
 %{_bindir}/olpc-test-devkey
+%attr(0644, -, -) %{_datadir}/sugar/data/sugar-xo.gtkrc
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
 %{_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}/event.d/ttyS0
 %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/xorg-dcon-1.3.conf
-%config(noreplace) %{_sysconfdir}/X11/xorg-emu-1.3.conf
-%config(noreplace) %{_sysconfdir}/pam.d/olpc-login
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
-%config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Mon Jun 29 2009 Daniel Drake <dsd at laptop.org> 1.0.2-1
+- Update to latest version, including XO-1.5 support
+
 * Thu Feb 26 2009 Adam Jackson <ajax at redhat.com> 0.89-10
 - Remove x11-input.fdi, this should all be automatically right already in
   F11 and later, and it breaks synaptics.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Nov 2008 23:50:28 -0000	1.3
+++ sources	29 Jun 2009 15:38:01 -0000	1.4
@@ -1 +1 @@
-fc7e0f8bcdd10f858eae4aef521b769d  olpc-utils-0.89.tar.bz2
+b96c8bb56be7b0ff12508fceae6d10d2  olpc-utils-1.0.2.tar.bz2


--- diskspace.patch DELETED ---


--- dot-xsession-example DELETED ---


--- olpc-login DELETED ---


--- olpc-utils-dbus.patch DELETED ---


--- olpc-utils-python2.6.patch DELETED ---


--- olpc-utils-touchpad.patch DELETED ---


--- xorg-dcon.conf DELETED ---