From 3cdd9e5b578291fc1fafee77b7456b5990041d2d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Wed, 17 Feb 2010 04:59:17 +0000
Subject: [PATCH] * Wed Feb 17 2010 Peter Hutterer <peter.hutterer@redhat.com>
 1.7.99.901-3.2010208 - Add 10-quirks.conf for specific black/whitelisting of
 devices. - xserver-1.8-udev-warning.patch: stick giant warning into log file
 that fdi   files need to be ported.

---
 10-quirks.conf       | 10 ++++++++++
 xorg-x11-server.spec | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 10-quirks.conf

diff --git a/10-quirks.conf b/10-quirks.conf
new file mode 100644
index 0000000..7afad22
--- /dev/null
+++ b/10-quirks.conf
@@ -0,0 +1,10 @@
+# Collection of quirks and blacklist/whitelists for specific devices.
+
+
+# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
+# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+Section "InputClass"
+        Identifier "ThinkPad HDAPS accelerometer blacklist"
+        MatchProduct "ThinkPad HDAPS accelerometer data"
+        Option "Ignore" "on"
+EndSection
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 99388ab..5b8d19b 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.99.901
-Release:   2.%{gitdate}%{dist}
+Release:   3.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -36,6 +36,7 @@ Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source1:   gitignore
 %endif
 Source3:   00-evdev.conf
+Source4:   10-quirks.conf
 
 Source10:   xserver.pamd
 
@@ -78,6 +79,9 @@ Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 
+# Remove this some day. Not today though.
+Patch6052: xserver-1.8-udev-warning.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -359,6 +363,7 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
 
 %endif
 
@@ -455,6 +460,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/xorg.conf.5*
 %dir %{_sysconfdir}/xorg.conf.d
 %{_sysconfdir}/xorg.conf.d/00-evdev.conf
+%{_sysconfdir}/xorg.conf.d/10-quirks.conf
 %endif
 
 
@@ -511,6 +517,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Feb 17 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-3.2010208
+- Add 10-quirks.conf for specific black/whitelisting of devices.
+- xserver-1.8-udev-warning.patch: stick giant warning into log file that fdi
+  files need to be ported.
+
 * Tue Feb 16 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-2.2010208
 - Add 00-evdev.conf this time.