[xorg-x11-server] don't build tests when --disable-xorg is used like on s390(x)

[Dan Horák]

commit 06dd782b5d6315bc012049b8de67e3185833cb5a
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jun 29 16:31:13 2011 +0200

    don't build tests when --disable-xorg is used like on s390(x)

 xorg-x11-server.spec         |    8 +++++++-
 xserver-1.10.99.1-test.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5dca6a8..3e2e241 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.10.99.1
-Release:   7%{?gitdate:.%{gitdate}}%{dist}
+Release:   8%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -83,6 +83,8 @@ Patch6053: xserver-1.8-disable-vboxvideo.patch
 
 # misc
 Patch7006: xserver-1.10-pointer-barriers.patch
+# tests require Xorg
+Patch7007: xserver-1.10.99.1-test.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -418,6 +420,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %if !%{with_hw_servers}
     rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc
     rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4
+    rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/xorg-server
 %endif
 }
 
@@ -550,6 +553,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Jun 29 2011 Dan Horák <dan[at]danny.cz> 1.10.99.1-8.20110511
+- don't build tests when --disable-xorg is used like on s390(x)
+
 * Tue Jun 21 2011 Adam Jackson <ajax at redhat.com> 1.10.99.1-7.20110511
 - BuildRequires: systemtap-sdt-devel, configure --with-dtrace
 
diff --git a/xserver-1.10.99.1-test.patch b/xserver-1.10.99.1-test.patch
new file mode 100644
index 0000000..8d704c3
--- /dev/null
+++ b/xserver-1.10.99.1-test.patch
@@ -0,0 +1,37 @@
+From 56a6a585918f1aa84da244dec803783cd90b92ac Mon Sep 17 00:00:00 2001
+From: Dan Horák <dan at danny.cz>
+Date: Wed, 29 Jun 2011 15:08:27 +0200
+Subject: [PATCH] test subdir requires xorg to be built
+
+Something changed between 20110418 and 20110510 and the test subdir is now
+processed. But it needs some libraries that are built as part of xorg driver.
+---
+ Makefile.am |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 62c8d95..bc4091d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,8 +38,7 @@ SUBDIRS = \
+ 	$(GLX_DIR) \
+ 	exa \
+ 	config \
+-	hw \
+-	test
++	hw
+ 
+ if XORG
+ aclocaldir = $(datadir)/aclocal
+@@ -47,6 +46,8 @@ aclocal_DATA = xorg-server.m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xorg-server.pc
++
++SUBDIRS += test
+ endif
+ 
+ EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
+-- 
+1.7.4.4
+