rpms/xorg-x11-server/devel xserver-1.8.0-no-xorg.patch, NONE, 1.1 xorg-x11-server.spec, 1.509, 1.510

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10765

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.8.0-no-xorg.patch 
Log Message:
* Tue Jun 22 2010 Dan Horák <dan at danny.cz> 1.8.0-8
- fix built with --disable-xorg like on s390/s390x


xserver-1.8.0-no-xorg.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xserver-1.8.0-no-xorg.patch ---
>From d7ad35e125cb9456d12abbd66ab061425d5e5564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 22 Jun 2010 18:19:38 +0200
Subject: [PATCH] XF86CONFIGDIR is undefined when built with --disable-xorg

---
 config/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index 675a3b2..4bea057 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,8 +9,10 @@ AM_CFLAGS += $(UDEV_CFLAGS)
 libconfig_la_SOURCES += udev.c
 libconfig_la_LIBADD = $(UDEV_LIBS)
 
+if XORG
 xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
 xorgconfd_DATA = 10-evdev.conf
+endif
 
 else
 
-- 
1.6.6.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- xorg-x11-server.spec	16 Jun 2010 14:53:59 -0000	1.509
+++ xorg-x11-server.spec	22 Jun 2010 16:54:57 -0000	1.510
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.8.0
-Release:   7%{?gitdate:.%{gitdate}}%{dist}
+Release:   8%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -99,6 +99,9 @@ Patch6055: xserver-1.7.6-export-dix-func
 Patch6056: xserver-1.7.6-export-more-dix-functions.patch
 Patch6057: xserver-1.8.0-xorg.conf.d-changes.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=28672
+Patch7000: xserver-1.8.0-no-xorg.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -570,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jun 22 2010 Dan Horák <dan at danny.cz> 1.8.0-8
+- fix built with --disable-xorg like on s390/s390x
+
 * Wed Jun 16 2010 Adam Jackson <ajax at redhat.com> 1.8.0-7
 - Make -Xorg package provide its own ABI versions.  Fail %%prep if they
   don't match what the specfile claims.