From 3087cbd068394a3dfc689a4e68efdca5262f6d51 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Mar 11 2009 18:20:28 +0000
Subject: * Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-11

- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)
  ACPI code.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 15ecd99..08fdddc 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.6.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,6 +75,9 @@ Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
 # cf. bug 482924
 Patch6010: xserver-1.5.99.902-selinux-debugging.patch
 
+# don't build the (broken) acpi code
+Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
+
 # don't try intel on poulsbo
 Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
 
@@ -503,6 +506,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-11
+- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)
+  ACPI code.
+
 * Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-10
 - xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy
   says to be an object manager.
diff --git a/xserver-1.6.0-less-acpi-brokenness.patch b/xserver-1.6.0-less-acpi-brokenness.patch
new file mode 100644
index 0000000..cc80e6c
--- /dev/null
+++ b/xserver-1.6.0-less-acpi-brokenness.patch
@@ -0,0 +1,31 @@
+From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 11 Mar 2009 14:02:11 -0400
+Subject: [PATCH] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 72ae67e..04716f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
+ 		case $host_cpu in
+ 		  ia64*)
+ 			linux_ia64=yes
+-			linux_acpi="yes"
+ 			;;
+ 		  alpha*)
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;
+-- 
+1.6.1.3
+