fix build without xorg (aka s390x)

xorg-x11-server.spec

@@ -48,7 +48,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.12.2
-Release:   1%{?gitdate:.%{gitdate}}%{dist}
+Release:   2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -103,6 +103,8 @@ Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 Patch7015: xserver-fix-pci-slot-claims.patch
 # backport modesetting fallback driver
 Patch7016: xserver-1.12-modesetting-fallback.patch
+# needed when building without xorg (aka s390x)
+Patch7017: xserver-1.12.2-xorg-touch-test.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -573,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Jun 15 2012 Dan Horák <dan[at]danny.cz> 1.12.2-2
+- fix build without xorg (aka s390x)
+
 * Wed May 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-1
 - xserver 1.12.2
 

xserver-1.12.2-xorg-touch-test.patch

@@ -0,0 +1,30 @@
+From ed61aafc4e2b2856955528ba8142075ce53d6dd9 Mon Sep 17 00:00:00 2001
+From: Dan Horák <dan@danny.cz>
+Date: Fri, 15 Jun 2012 06:25:58 -0400
+Subject: [PATCH] build the touch test only when building Xorg
+
+---
+ test/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 32be00d..93a102a 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -1,11 +1,11 @@
+ if ENABLE_UNIT_TESTS
+ SUBDIRS= .
+-noinst_PROGRAMS = list string touch
++noinst_PROGRAMS = list string
+ if XORG
+ # Tests that require at least some DDX functions in order to fully link
+ # For now, requires xf86 ddx, could be adjusted to use another
+ SUBDIRS += xi2
+-noinst_PROGRAMS += xkb input xtest misc fixes xfree86
++noinst_PROGRAMS += xkb input xtest misc fixes xfree86 touch
+ endif
+ check_LTLIBRARIES = libxservertest.la
+ 
+-- 
+1.7.10.2
+