From 5d668aa7294ad616b10993ed3d62b82baa9df34d Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Thu, 1 Dec 2005 03:19:30 +0000
Subject: [PATCH] auto-import libdrm-2.0-1 on branch devel from
 libdrm-2.0-1.src.rpm

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

diff --git a/.cvsignore b/.cvsignore
index 65feb76..9dfeb32 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdrm-1.0.5.tar.gz
+libdrm-2.0.tar.gz
diff --git a/libdrm.spec b/libdrm.spec
index fd59985..2976ef4 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,6 +1,6 @@
 Summary: Digital Rights Managment library
 Name: libdrm
-Version: 1.0.5
+Version: 2.0
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 Digital Rights Management runtime library
@@ -25,7 +25,7 @@ Summary: libdrm-devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 Digital Rights Management development package
@@ -56,8 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README
-%{_libdir}/libdrm.so.1
-%{_libdir}/libdrm.so.1.0.0
+#%{_libdir}/libdrm.so.1
+#%{_libdir}/libdrm.so.1.0.0
+%{_libdir}/libdrm.so.2
+%{_libdir}/libdrm.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Wed Nov 30 2005 Mike A. Harris <mharris@redhat.com> 2.0-1
+- Updated libdrm to version 2.0 from dri.sf.net.  This is an ABI incompatible
+  release, meaning everything linked to it needs to be recompiled.
+
 * Tue Nov  1 2005 Mike A. Harris <mharris@redhat.com> 1.0.5-1
 - Updated libdrm to version 1.0.5 from dri.sf.net upstream to work around
   mesa unichrome dri driver compile failure.
diff --git a/sources b/sources
index 0b8e18c..df77f92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e31257237969d5fc2c9e9eb4ad8110cf  libdrm-1.0.5.tar.gz
+9d1aab104eb757ceeb2c1a6d38d57411  libdrm-2.0.tar.gz