From c103421ad4465f1eae11b50b8e6e9f21a3adb0b2 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Fri, 17 Nov 2006 17:19:46 +0000
Subject: [PATCH] auto-import libdrm-2.3.0-1.fc7 on branch devel from    
 libdrm-2.3.0-1.fc7.src.rpm

---
 .cvsignore  |  2 +-
 libdrm.spec | 16 +++++++++++++---
 sources     |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 562c023..f4c2394 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdrm-2.0.2.tar.bz2
+libdrm-2.3.0.tar.bz2
diff --git a/libdrm.spec b/libdrm.spec
index 89463c4..b0b51ea 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.0.2
-Release: 3%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -14,6 +14,8 @@ BuildRequires: pkgconfig
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
+Patch0: nouveau-20061117.patch
+
 %description
 libdrm Direct Rendering Manager runtime library
 
@@ -29,6 +31,7 @@ libdrm Direct Rendering Manager development package
 
 %prep
 %setup -q 
+%patch0 -p1 -b .nouveau
 
 %build
 %configure
@@ -51,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README
 %{_libdir}/libdrm.so.2
-%{_libdir}/libdrm.so.2.0.0
+%{_libdir}/libdrm.so.2.3.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -60,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/drm/drm.h
 %{_includedir}/drm/drm_sarea.h
 %{_includedir}/drm/i915_drm.h
+%{_includedir}/drm/nouveau_drm.h
 %{_includedir}/drm/mach64_drm.h
 %{_includedir}/drm/mga_drm.h
 %{_includedir}/drm/r128_drm.h
@@ -69,11 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/drm/sis_drm.h
 %{_includedir}/drm/via_3d_reg.h
 %{_includedir}/drm/via_drm.h
+# FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
+%{_includedir}/xf86mm.h
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Fri Nov 17 2006 Adam Jackson <ajax@redhat.com> 2.3.0-1.fc7
+- Update to 2.3.0 from upstream.
+- Add nouveau userspace header.
+
 * Wed Jul 26 2006 Kristian Høgsberg <krh@redhat.com> - 2.0.2-3.fc6
 - Build for rawhide.
 
diff --git a/sources b/sources
index 5e740d3..8fa67c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db7f1f89d2571427d6ea1feb2466f577  libdrm-2.0.2.tar.bz2
+01a1e1ee0268a2403db42fa630036ab2  libdrm-2.3.0.tar.bz2