From 1a6a35980a998e2e5ecac1fe1c9fc09f8739114a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Aug 07 2009 11:37:15 +0000
Subject: * Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-30.20090807

- goddamit: reapply picify libxf86config.a hopefully

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3d31477..8434854 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   29.%{gitdate}%{?dist}
+Release:   30.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -46,6 +46,7 @@ Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
 Source30: find-provides
 #define __find_provides {nil}
 
+Patch5: xserver-1.4.99-pic-libxf86config.patch
 Patch10: xserver-1.6.99-linkmap.patch
 
 # airlied to upstream for 1.7
@@ -513,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-30.20090807
+- goddamit: reapply picify libxf86config.a hopefully
+
 * Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-29.20090807
 - rebase upstream
 - libxf86config.a revenge, brought back .a upstream, doesn't work as .so
diff --git a/xserver-1.4.99-pic-libxf86config.patch b/xserver-1.4.99-pic-libxf86config.patch
index efdd2db..48d2e22 100644
--- a/xserver-1.4.99-pic-libxf86config.patch
+++ b/xserver-1.4.99-pic-libxf86config.patch
@@ -1,25 +1,18 @@
-From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001
+From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 1 Nov 2007 15:02:24 -0400
+Date: Mon, 10 Dec 2007 11:26:57 -0500
 Subject: [PATCH] Build libxf86config with -fPIC.
 
----
- hw/xfree86/parser/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
 diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 849ee8b..0691158 100644
+index b8fab28..ed831c9 100644
 --- a/hw/xfree86/parser/Makefile.am
 +++ b/hw/xfree86/parser/Makefile.am
-@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
- 	DRI.c \
- 	Extensions.c
+@@ -33,7 +33,7 @@ libxf86config_a_SOURCES = \
+ 	$(INTERNAL_SOURCES)
+ libxf86config_a_CFLAGS = $(AM_CFLAGS)
  
 -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden
  
  EXTRA_DIST = \
  	Configint.h \
--- 
-1.5.3.4
-