rpms/olpc-utils/F-10 olpc-utils.spec,1.1,1.2 sources,1.2,1.3

Mon Nov 17 23:52:49 UTC 2008

Author: pbrobinson

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

Modified Files:
	olpc-utils.spec sources 
Log Message:
- Merge from branch to F10 branch



Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-10/olpc-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- olpc-utils.spec	9 May 2008 01:18:00 -0000	1.1
+++ olpc-utils.spec	17 Nov 2008 23:52:18 -0000	1.2
@@ -1,38 +1,27 @@
-Name:		olpc-utils
-Version:	0.71
-Release:	1%{?dist}
-Summary:	OLPC utilities
-URL:		http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
-Group:		System Environment/Base
-License:	GPLv2+
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  git clone git://dev.laptop.org/projects/olpc-utils;
-#  cd olpc-utils
-#  git checkout v%{version}
-#  ./autoconf.sh
-#  make dist
-Source0:	olpc-utils-%{version}.tar.bz2
-Source100:	dot-xsession-example
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:       olpc-utils
+Version:    0.89
+Release:    5%{?dist}
+Summary:    OLPC utilities
+URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
+Group:      System Environment/Base
+License:    GPLv2+
+Source0:    %{name}-%{version}.tar.bz2
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch1: olpc-utils-dbus.patch
 
 # for olpc-dm
 BuildRequires:  pam-devel
 Requires:       pam
 
-# for olpc-netcapture
-Requires:	tcpdump
-
-# for olpc-netlog
-Requires:	ethtool
-Requires:	tar
-Requires:	gzip
-
 # for olpc-configure
-Requires:	/usr/bin/find
+Requires:   /usr/bin/find
 
 # for become_root
-Requires:	/bin/su
+Requires:   /bin/su
+
+# for olpc-test-devkey
+Requires:   olpcupdate >= 2.10
 
 %description
 
@@ -42,26 +31,28 @@
 %prep
 %setup -q
 
+%patch1 -p1
 
 %build
-%configure
-make %{?_smp_mflags}
+make -f Makefile.build %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-install -D -m 0644 %{SOURCE100} $RPM_BUILD_ROOT/etc/skel/.xsession-example
+make -f Makefile.build install DESTDIR=%{buildroot}
 
 
 %post
 /sbin/chkconfig --add olpc-configure
+/sbin/chkconfig --add diskspacecheck
+/sbin/chkconfig --add diskspacerecover
 
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/chkconfig --del olpc-configure
+    /sbin/chkconfig --del olpc-configure
+    /sbin/chkconfig --del diskspacecheck
+    /sbin/chkconfig --del diskspacerecover
 fi
 
 
@@ -78,29 +69,128 @@
 %{_sbindir}/setolpckeys
 %{_sbindir}/olpc-dm
 %{_bindir}/olpc-logbat
-%{_bindir}/olpc-netlog
-%{_bindir}/olpc-netcapture
-%{_bindir}/olpc-netstatus
 %{_bindir}/olpc-session
-%{_bindir}/olpc-pwr-prof
-%{_bindir}/olpc-pwr-prof-send
-%{_bindir}/sudo
+%{_bindir}/olpc-pwr-log
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
+%{_bindir}/olpc-test-devkey
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
-%{_sysconfdir}/motd.olpc
-%{_sysconfdir}/X11/xorg-dcon.conf
-%{_sysconfdir}/X11/xorg-emu.conf
-%{_sysconfdir}/X11/xorg-vmware.conf
-%{_sysconfdir}/X11/xorg-dcon-1.3.conf
-%{_sysconfdir}/X11/xorg-emu-1.3.conf
 %{_sysconfdir}/rc.d/init.d/olpc-configure
-%{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/skel/.xsession-example
-
+%{_sysconfdir}/rc.d/init.d/diskspacecheck
+%{_sysconfdir}/rc.d/init.d/diskspacerecover
+%config(noreplace) %{_sysconfdir}/hal/fdi/policy/x11-input.fdi
+%config(noreplace) %{_sysconfdir}/motd.olpc
+%config(noreplace) %{_sysconfdir}/X11/xorg-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
+* Sat Oct 25 2008 Peter Robinson <pbrobinson at gmail.com> 0.89-5
+- Merge OLPC-3 branch into devel
+
+* Sat Oct  1 2008 Marco Pesenti Gritti <mpg at redhat.com> 0.89-4
+- Marco Pesenti Gritti (1):
+    Fix typo in the dbus session patch.
+
+* Sat Oct  1 2008 Marco Pesenti Gritti <mpg at redhat.com> 0.89-3
+- Marco Pesenti Gritti (1):
+    Add missing quotes in the dbus session patch.
+
+* Sat Oct  1 2008 Marco Pesenti Gritti <mpg at redhat.com> 0.89-2
+- Marco Pesenti Gritti (1):
+    Make olpc-session launch a dbus-session before running sugar.
+
+* Mon Sep 29 2008 Michael Stone <michael at laptop.org> 0.89-1
+- Chris Ball (2):
+    Require 20 MB of free-space, not 600 MB.
+    Properly skip cleanup logic when space is available.
+
+* Mon Sep 29 2008 Michael Stone <michael at laptop.org> 0.88-1
+- Chris Ball (1):
+    dlo#7932: Fix failsafe script in the presence of pretty-boot.
+
+* Tue Sep 23 2008 Michael Stone <michael at laptop.org> 0.87-1
+- Chris Ball (1):
+    dlo#7932: Set up utf8 environment, and display a UTF-8 string.
+
+* Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.86-1
+- Guillaume Desmottes (1):
+    xsession-example: open Telepathy log files in append mode instead of trunc (#8142)
+
+* Tue Sep 02 2008 Michael Stone <michael at laptop.org> 0.85-1
+- Michael Stone (1):
+    dlo#7690: Remove the msh0-renaming rule since dlo#5746 was fixed upstream.
+
+* Fri Aug 15 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 0.84-1
+- Sayamindu Dasgupta (1):
+    dlo#7818: Load the XIM GTK Input Module conditionally.
+- Chris Ball (1):
+    dlo#7932, dlo#7125: Install disk-space failsafe script.
+
+* Tue Aug 05 2008 Michael Stone <michael at laptop.org> 0.83-1
+- C. Scott Ananian (1):
+    Trac #5705: fix dbus at_console policy rule.
+- Richard Smith (1):
+    Update power logging scripts.
+
+* Sat Aug 02 2008 Michael Stone <michael at laptop.org> 0.82-1
+- C. Scott Ananian (2):
+    dlo#5705: allow specification of the tty used for X on the command line.
+    Delint olpc-dm.
+- Martin Dengler (1):
+    dlo#7442 start olpc-dm on tty3 and no other
+
+* Thu Jul 24 2008 Michael Stone <michael at laptop.org> 0.81-1
+- cscott: dlo#317: Set appropriate ICEAUTHORITY, XAUTHORITY, and XSERVERAUTH
+  variables to move these to a tmpfs.
+
+* Wed Jul 23 2008 Michael Stone <michael at laptop.org> 0.80-1
+- sayamindu: dlo#7474: Choose the XIM method by default.
+- pgf: dlo#7537: Be more precise when assigning permissions to /home/olpc.
+
+* Tue Jul 22 2008 Michael Stone <michael at laptop.org> 0.79-1
+- cscott: dlo#7495: Trigger activity update on base OS upgrade.
+
+* Tue Jul 08 2008 Michael Stone <michael at laptop.org> 0.78-1
+- dsd: dlo#7211: Increase mouse sensitivity.
+
+* Mon Jul 07 2008 Michael Stone <michael at laptop.org> 0.77-1
+- Bump revision number.
+
+* Thu Jul 03 2008 C. Scott Ananian <cscott at laptop.org> 0.76-1
+- dlo#6432: local installation of RPMs on first boot.
+- dlo#7171: move network testing tools to olpc-netutils
+- add olpc-test-devkey script to verify a developer key.
+
+* Tue Jun 24 2008 Michael Stone <michael at laptop.org> 0.75-1
+- mstone:
+    Merge Fedora's divergence.
+    Replace autotools with GNUmake.
+- erikg: Reduce mouse acceleration.
+    dlo#7211: Touchpad is super-sensitive in olpc3 builds.
+- dsd/marco: Properly initialize a ConsoleKit session.
+    dlo#7266: Can't restart/shutdown system from sugar with olpc3.
+    dlo#7289: No USB automount with olpc3.
+- ausil:
+    include x11-input.fdi
+    update xorg-dcon.conf
+    (temporarily?) drop our custom sudo implementation.
+
+* Tue May 27 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 0.74-1
+- dlo#6945: Added workaround for typo in mfg-data for Ethiopian machines.
+
+* Fri May 16 2008 Michael Stone <michael at laptop.org> - 0.73-1
+- dlo#6767: Run make_index.py with a reasonable value of LANG.
+
+* Fri May 16 2008 Sayamindu Dasgupta <sayamindu at gmail.com> - 0.72-1
+- dlo#6945: Export GTK_IM_MODULE so that other modules such as Amharic does not get picked up.
+
 * Sun Mar 21 2008 Michael Stone <michael at laptop.org> - 0.71-1
 - dlo#5746: Use a more precise udev ignore-me rule for msh* interfaces.
 
@@ -217,7 +307,7 @@
 - Bump revision
 
 * Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.51-2
-- Add olpc-netcapture to %files
+- Add olpc-netcapture to %%files
 
 * Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.51-1
 - Fix olpc#5195: Console font too small when using pretty boot.
@@ -346,9 +436,9 @@
 * Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com 0.11-1
 - Newer source from J5 which fixes a permission issue. Fix build root cleanup.
 * Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com 0.10-1
-- Newer source and spec cleanups from J5 
+- Newer source and spec cleanups from J5
 * Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com 0.1-3
-- Split off dbench. Added a description for bios signature tool. 
+- Split off dbench. Added a description for bios signature tool.
 * Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-2
 - Submit for review in Fedora
 * Fri Nov 10 2006 John (J5) Palmieri <johnp at redhat.com> - 0.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2008 01:18:00 -0000	1.2
+++ sources	17 Nov 2008 23:52:18 -0000	1.3
@@ -1 +1 @@
-f1e4e02f0878528a5d97304e8bded6e3  olpc-utils-0.71.tar.bz2
+fc7e0f8bcdd10f858eae4aef521b769d  olpc-utils-0.89.tar.bz2


