From 0a1c4cefe6431497e98e085ab25a2ada3f0b5eda Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Fri, 25 Sep 2009 01:58:04 +0000
Subject: [PATCH] - rebase to latest upstream release - drop carried patches

---
 libdrm.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libdrm.spec b/libdrm.spec
index 5e4f79e..4361ce0 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -2,13 +2,13 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.12
-Release: 0.10%{?dist}
+Version: 2.4.14
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.bz2
+Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,12 +46,11 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-%patch2 -p1 -b .radeon-busy
+#%setup -q -n %{name}-%{gitdate}
+%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
-%patch6 -p1 -b .intel-busy
 
 %build
 autoreconf -v --install || exit 1
@@ -111,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied@redhat.com> 2.4.14-1
+- rebase to latest upstream release - drop carried patches
+
 * Thu Sep 10 2009 Kristian Høgsberg <krh@redhat.com> - 2.4.12-0.10
 - Pull in intel bo busy.