rpms/xorg-x11-server/F-10 xserver-1.5.3-new-automake.patch, NONE, 1.1 xorg-x11-server.spec, 1.396, 1.397

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.3-new-automake.patch 
Log Message:
* Mon Nov 23 2009 Adam Jackson <ajax at redhat.com> 1.5.3-18
- xserver-1.5.3-new-automake.patch: Fix build with new automake. (#508758)


xserver-1.5.3-new-automake.patch:
 common/Makefile.am |    1 -
 parser/Makefile.am |    4 ----
 2 files changed, 5 deletions(-)

--- NEW FILE xserver-1.5.3-new-automake.patch ---
>From c45a1c190b06ae7f840cd341d7865224bb95fca0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 21 Oct 2009 15:55:56 -0400
Subject: [PATCH] fix build with new automake

---
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 241736b..2a610ae 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -11,7 +11,6 @@ endif
 
 if XV
 XVSOURCES = xf86xv.c xf86xvmc.c
-XVSDKINCS = xf86xv.h xf86xvmc.h
 endif
 
 XKBSOURCES = xf86XKB.c
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 0691158..a0158b8 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,8 +1,5 @@
 if INSTALL_LIBXF86CONFIG
 lib_LIBRARIES = libxf86config.a
-LIBHEADERS = \
-	xf86Optrec.h \
-	xf86Parser.h
 else
 noinst_LIBRARIES = libxf86config.a
 endif
-- 
1.6.4.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- xorg-x11-server.spec	24 May 2009 23:36:07 -0000	1.396
+++ xorg-x11-server.spec	23 Nov 2009 22:25:00 -0000	1.397
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -107,6 +107,7 @@ Patch6010: xserver-1.5.3-hdmi.patch
 Patch6011: xserver-1.5.3-dga-crash-fix.patch
 # #456378, patch from upstream
 Patch6012: xserver-1.6.1-xkbsendmap.patch
+Patch6013: xserver-1.5.3-new-automake.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -540,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 23 2009 Adam Jackson <ajax at redhat.com> 1.5.3-18
+- xserver-1.5.3-new-automake.patch: Fix build with new automake. (#508758)
+
 * Mon May 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-17
 - xserver-1.6.1-xkbsendmap.patch: Fix crash due to uninitialized VModMap fields.