Drop xserver-1.10.99.1-test.patch:

cd89482088f71ed517c2e88ed437e4752070c3f4 fixed it
This commit is contained in:
Peter Hutterer 2012-05-14 17:48:44 +10:00
parent a03561534d
commit ed174bfb21
2 changed files with 4 additions and 40 deletions

View File

@ -95,9 +95,6 @@ Patch6027: xserver-1.6.0-displayfd.patch
Patch6030: xserver-1.6.99-right-of.patch
#Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
# tests require Xorg
Patch7007: xserver-1.10.99.1-test.patch
# Fix libselinux-triggered build error
# RedHat/Fedora-specific patch
Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
@ -574,6 +571,10 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Mon May 14 2012 Peter Hutterer <peter.hutterer@redhat.com>
- Drop xserver-1.10.99.1-test.patch:
cd89482088f71ed517c2e88ed437e4752070c3f4 fixed it
* Mon May 14 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.1-1
- server 1.12.1
- force autoreconf to avoid libtool errors

View File

@ -1,37 +0,0 @@
From db8153bd5f476114f6a1b7ac40357c8bc39331ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 29 Jun 2011 15:08:27 +0200
Subject: [PATCH 5/7] 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 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cea140b..72f3d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,8 +39,7 @@ SUBDIRS = \
$(GLX_DIR) \
exa \
config \
- hw \
- test
+ hw
if XORG
aclocaldir = $(datadir)/aclocal
@@ -48,6 +47,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.10.1