rpms/xorg-x11-server/devel xserver-1.5.99.903-fontmod.h, NONE, 1.1 xorg-x11-server.spec, 1.410, 1.411

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24391

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.903-fontmod.h 
Log Message:
* Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.5.99.903-3
- xserver-1.5.99.903-fontmod.h: Fix build against new libXfont.



--- NEW FILE xserver-1.5.99.903-fontmod.h ---
>From 24a1f522d52d9cf5720dad28107bea33e623fd7b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 18 Feb 2009 15:33:14 -0500
Subject: [PATCH] uninclude fontmod.h

---
 hw/xfree86/loader/loaderProcs.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index 827f3a9..a10f0b3 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/hw/xfree86/loader/loaderProcs.h
@@ -56,7 +56,6 @@
 #undef IN_LOADER
 #define IN_LOADER
 #include "xf86Module.h"
-#include <X11/fonts/fontmod.h>
 
 typedef struct module_desc {
     struct module_desc *child;
-- 
1.6.1.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- xorg-x11-server.spec	18 Feb 2009 17:05:49 -0000	1.410
+++ xorg-x11-server.spec	18 Feb 2009 20:34:14 -0000	1.411
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.903
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -95,6 +95,7 @@
 Patch6017: xserver-1.5.99.902-nouveau.patch
 
 Patch6018: xserver-1.5.99.903-glx-visual-score.patch
+Patch6019: xserver-1.5.99.903-fontmod.h
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -512,6 +513,9 @@
 
 
 %changelog
+* Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.5.99.903-3
+- xserver-1.5.99.903-fontmod.h: Fix build against new libXfont.
+
 * Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.5.99.903-2
 - xserver-1.5.99.903-glx-visual-score.patch: Fix visual scoring.