rpms/olpc-utils/OLPC-3 x11-input.fdi, NONE, 1.1 olpc-utils.spec, 1.1, 1.2

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	olpc-utils.spec 
Added Files:
	x11-input.fdi 
Log Message:
add .fdi for touchpad



--- NEW FILE x11-input.fdi ---
<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
  <device>
    <match key="info.capabilities" contains="input.touchpad">
      <merge key="input.x11_driver" type="string">mouse</merge>
      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
             string="Linux">
        <merge key="input.x11_driver" type="string">evdev</merge>
      </match>
    </match>

    <match key="info.capabilities" contains="input.mouse">
      <merge key="input.x11_driver" type="string">mouse</merge>
      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
             string="Linux">
        <merge key="input.x11_driver" type="string">evdev</merge>
      </match>
    </match>

    <match key="info.capabilities" contains="input.keys">
      <merge key="input.xkb.rules" type="string">base</merge>

      <!-- If we're using Linux, we use evdev by default (falling back to
           keyboard otherwise). -->
      <merge key="input.x11_driver" type="string">keyboard</merge>
      <merge key="input.xkb.model" type="string">olpc</merge>
      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
             string="Linux">
        <merge key="input.x11_driver" type="string">evdev</merge>
        <merge key="input.xkb.model" type="string">evdev</merge>
      </match>

      <merge key="input.xkb.layout" type="string">us</merge>

      <merge key="input.xkb.variant" type="string" />
    </match>

    <!-- older versions of HAL use "keyboard" instead of keys -->
    <match key="info.capabilities" contains="input.keyboard">
      <merge key="input.xkb.rules" type="string">base</merge>

      <!-- If we're using Linux, we use evdev by default (falling back to
           keyboard otherwise). -->
      <merge key="input.x11_driver" type="string">keyboard</merge>
      <merge key="input.xkb.model" type="string">pc105</merge>
      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
             string="Linux">
        <merge key="input.x11_driver" type="string">evdev</merge>
        <merge key="input.xkb.model" type="string">evdev</merge>
      </match>

      <merge key="input.xkb.layout" type="string">us</merge>

      <merge key="input.xkb.variant" type="string" />
    </match>
  </device>
</deviceinfo>


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olpc-utils.spec	16 May 2008 04:05:02 -0000	1.1
+++ olpc-utils.spec	16 May 2008 05:09:39 -0000	1.2
@@ -13,6 +13,7 @@
 #  ./autoconf.sh
 #  make dist
 Source0:	olpc-utils-%{version}.tar.bz2
+Source1:        x11-input.fdi
 Source100:	dot-xsession-example
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,7 +54,8 @@
 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
 
 %post
 /sbin/chkconfig --add olpc-configure
@@ -89,6 +91,7 @@
 %{_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
@@ -101,6 +104,9 @@
 
 
 %changelog
+* Fri May 16 2008 Dennis Gilmore <dennis at laptop.org> - 0.73-2
+- add .fdi file for touchpad
+
 * 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.