[olpc-utils] Add bitfrost dep for olpc-test-devkey - fixes # 688510

Peter Robinson pbrobinson at fedoraproject.org
Wed Apr 6 20:36:48 UTC 2011


commit 6fe4a45d4667e85b0ebd5971b77921240da7d995
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 6 21:36:46 2011 +0100

    Add bitfrost dep for olpc-test-devkey - fixes # 688510

 olpc-utils.spec |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/olpc-utils.spec b/olpc-utils.spec
index 1dc4ca6..4c4f55f 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,28 +1,28 @@
 Name:       olpc-utils
 Version:    1.2.9
-Release:    1%{?dist}
+Release:    2%{?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
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1:    olpc-configure.service
 
 # for olpc-dm
-BuildRequires:  ConsoleKit-devel
-Requires:       /usr/bin/xauth
+BuildRequires: ConsoleKit-devel
+Requires:      xorg-x11-xauth
 
 # for olpc-configure
-Requires:   /usr/bin/find
-Requires:	systemd-units
+Requires:      findutils
+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
+Requires:      module-init-tools
 
 # for SiSUSB2VGA support
 Requires: xorg-x11-drv-sisusb
@@ -44,7 +44,6 @@ make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
-rm -rf %{buildroot}
 make -f Makefile.build install DESTDIR=%{buildroot}
 rm -f %{buildroot}/etc/init/ttyS0.conf # now provided by systemd
 mv %{buildroot}/etc/rc.d/init.d/olpc-configure %{buildroot}/usr/sbin
@@ -68,9 +67,6 @@ if [ $1 = 0 ]; then
     /sbin/chkconfig --del diskspacerecover
 fi
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -101,6 +97,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/modprobe.d/olpc-psmouse.conf
 
 %changelog
+* Wed Apr  6 2011 Peter Robinson <pbrobinson at gmail.com> - 1.2.9-2
+- Add bitfrost dep for olpc-test-devkey - fixes # 688510
+
 * Thu Mar 17 2011 Daniel Drake <dsd at laptop.org> - 1.2.9-1
 - force-disable DPMS to workaround bug in chrome driver
 - olpc-dm: disable X TCP port


More information about the scm-commits mailing list