rpms/olpc-utils/OLPC-3 olpc-login, NONE, 1.1 xorg-dcon.conf, NONE, 1.1 olpc-utils.spec, 1.4, 1.5

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-login xorg-dcon.conf 
Log Message:
updated xorg.conf file and olpc-login



--- NEW FILE olpc-login ---
#%PAM-1.0
auth       required    pam_env.so
auth       required    pam_permit.so
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so



--- NEW FILE xorg-dcon.conf ---
# Xorg configuration file for OLPC

Section "ServerLayout"
	Identifier     "Default Layout"
	Screen      0  "Screen0" 0 0
EndSection

#Section "ServerFlags"
	#Option "AllowEmptyInput" "yes"
#EndSection

Section "Module"
	SubSection "extmod"
		Option "omit XFree86-DGA"
		#Option "omit XFree86-Misc" # needed by 'xset m'
		Option "omit MIT-SUNDRY-NONSTANDARD"
		Option "omit TOG-CUP"
		Option "omit Extended-Visual-Information"
	EndSubSection
	Load  "freetype"
	Load  "evdev"
	# Load "record" # Mostly a debugging tool
EndSection

Section "Extensions"
	Option  "XTEST" "Disable" # Mostly a debugging tool
	#Option  "SECURITY" "Disable" # CRASH!
	Option  "XC-APPGROUP" "Disable"
	Option  "XINERAMA" "Disable"
EndSection

Section "Monitor"
	Identifier  "Monitor0"
	HorizSync   30-67
	VertRefresh 48-52 
	DisplaySize 152 114
	Mode "1200x900"
		DotClock 57.275
		HTimings 1200 1208 1216 1240
		VTimings 900 905 908 912
		Flags    "-HSync" "-VSync"
	EndMode
EndSection

Section "Device"
	Identifier  "Videocard0"
	Driver      "amd"
	VendorName  "Advanced Micro Devices, Inc."
	BoardName   "AMD Geode GX/LX"

	Option     "AccelMethod" "EXA"
	Option     "NoCompression" "true"
	Option     "PanelGeometry" "1200x900"
EndSection

Section "Screen"
	Identifier "Screen0"
	Device     "Videocard0"
	Monitor    "Monitor0"
	DefaultDepth 16
	SubSection "Display"
		Depth   16
		Modes   "1200x900"
	EndSubSection
EndSection
Section "InputDevice"
        Identifier "fake"
        Driver     "void"
EndSection

Section "InputDevice"
        Identifier "ATKbd"
        Driver     "evdev"

        Option  "Name"  "AT Translated Set 2 keyboard"
        Option  "evBits"    "+1"
        Option  "keyBits"   "~1-255 ~352-511"
        Option  "Pass"      "2"
EndSection
Section "InputDevice"
        Identifier "Keyboard"
        Driver     "evdev"

        Option  "evBits"    "+1"
        Option  "keyBits"   "~1-115 ~117-255"
        Option  "Pass"      "3"
EndSection

Section "InputDevice"
        Identifier "Mouse"
        Driver     "evdev"

        Option  "evBits"    "+1-2"
        Option  "keyBits"   "~272-287"
        Option  "Pass"      "3"
EndSection
Section "InputDevice"
        Identifier "GS"
        Driver     "evdev"

        Option  "Name" "OLPC ALPS GlideSensor"
        Option  "evBits"    "+1 +3"
        Option  "keyBits"   "~272-287"
        Option  "absBits"   "~0-2 ~24"
        Option  "Pass"      "2"
        Option  "Mode"      "Relative"
EndSection


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- olpc-utils.spec	16 May 2008 05:39:46 -0000	1.4
+++ olpc-utils.spec	3 Jun 2008 19:21:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		olpc-utils
 Version:	0.73
-Release:	2%{?dist}.1
+Release:	2%{?dist}.2
 Summary:	OLPC utilities
 URL:		http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:		System Environment/Base
@@ -14,6 +14,8 @@
 #  make dist
 Source0:	olpc-utils-%{version}.tar.bz2
 Source1:        x11-input.fdi
+Source2:        xorg-dcon.conf
+Source3:        olpc-login
 Source100:	dot-xsession-example
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,17 +55,20 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-install -D -m 0644 %{SOURCE100} $RPM_BUILD_ROOT/etc/skel/.xsession-example
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy
-install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy
+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
 
 
-%preun
-if [ $1 = 0 ]; then
+%preunif [ $1 = 0 ]; then
 	/sbin/chkconfig --del olpc-configure
 fi
 
@@ -99,12 +104,16 @@
 %{_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
 
 
 %changelog
+* 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