rpms/olpc-utils/OLPC-3 .cvsignore, 1.1, 1.2 olpc-utils.spec, 1.7, 1.8 sources, 1.2, 1.3

Wed Jun 25 09:18:34 UTC 2008

Author: mstone

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30881

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
- 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.



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

--- .cvsignore	25 Jun 2007 18:51:26 -0000	1.1
+++ .cvsignore	25 Jun 2008 09:17:46 -0000	1.2
@@ -0,0 +1 @@
+olpc-utils-0.75.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- olpc-utils.spec	13 Jun 2008 18:47:59 -0000	1.7
+++ olpc-utils.spec	25 Jun 2008 09:17:46 -0000	1.8
@@ -1,42 +1,30 @@
-Name:		olpc-utils
-Version:	0.73
-Release:	2%{?dist}.3
-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
-Source1:        x11-input.fdi
-Source2:        xorg-dcon.conf
-Source3:        olpc-login
-Patch0:         olpc-utils-touchpad.patch
-Source100:	dot-xsession-example
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:       olpc-utils
+Version:    0.75
+Release:    1%{?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)
 
 # for olpc-dm
 BuildRequires:  pam-devel
 Requires:       pam
 
 # for olpc-netcapture
-Requires:	tcpdump
+Requires:   tcpdump
 
 # for olpc-netlog
-Requires:	ethtool
-Requires:	tar
-Requires:	gzip
+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
 
 %description
 
@@ -45,32 +33,24 @@
 
 %prep
 %setup -q
-%patch -p1
+
 
 %build
-%configure
-make %{?_smp_mflags}
+make -f Makefile.build %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make -f Makefile.build install DESTDIR=%{buildroot}
 
-install -D -m 0644 %{SOURCE100} %{buildroot}/etc/skel/.xsession-example
-mkdir -p %{buildroot}%{_sysconfdir}/hal/fdi/policy
-mkdir -p %{buildroot}%{_sysconfdir}/X11
-mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/hal/fdi/policy
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d
-rm -rf $RPM_BUILD_ROOT%{_bindir}/sudo
 
 %post
 /sbin/chkconfig --add olpc-configure
 
 
-%preunif [ $1 = 0 ]; then
-	/sbin/chkconfig --del olpc-configure
+%preun
+if [ $1 = 0 ]; then
+    /sbin/chkconfig --del olpc-configure
 fi
 
 
@@ -93,42 +73,46 @@
 %{_bindir}/olpc-session
 %{_bindir}/olpc-pwr-prof
 %{_bindir}/olpc-pwr-prof-send
-#{_bindir}/sudo
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
-%{_sysconfdir}/hal/fdi/policy/x11-input.fdi
-%{_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}/pam.d/olpc-login
 %{_sysconfdir}/rc.d/init.d/olpc-configure
-%{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/skel/.xsession-example
+%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}/udev/rules.d
+%config(noreplace) %{_sysconfdir}/skel/.xsession-example
 
 
 %changelog
-* Fri Jun 13 2008 Dennis Gilmore <dennis at laptop.org> - 0.73-2.3
-- apply patch for touchpad
-
-* Tue Jun 02 2008 Dennis Gilmore <dennis at laptop.org> - 0.73-2.2
-- drop in olpc-login and a new xorg config file
-
-* Fri May 16 2008 Dennis Gilmore <dennis at laptop.org> - 0.73-2.1
--remove our sudo for now
+* 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.
 
-* Fri May 16 2008 Dennis Gilmore <dennis at laptop.org> - 0.73-2
-- add .fdi file for touchpad
+* 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. 
+- 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.
@@ -246,7 +230,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.
@@ -375,9 +359,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/OLPC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2008 04:05:02 -0000	1.2
+++ sources	25 Jun 2008 09:17:46 -0000	1.3
@@ -1 +1 @@
-3539bca1ef364c617c198c9f542b2003  olpc-utils-0.73.tar.bz2
+db814bf066d6b855b99e681fca7eec6e  olpc-utils-0.75.tar.bz2


