- new upstream git snapshot

.cvsignore

@@ -1 +1 @@
-libdrm-2.4.18.tar.bz2
+libdrm-20100529.tar.bz2

libdrm.spec

@@ -1,14 +1,14 @@
-# %define gitdate 20100217
+%define gitdate 20100529
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.20
-Release: 1%{?dist}
+Version: 2.4.21
+Release: 0.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)
 
@@ -42,14 +42,14 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-#%setup -q -n %{name}-%{gitdate}
-%setup -q 
+%setup -q -n %{name}-%{gitdate}
+#%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 
 %build
 autoreconf -v --install || exit 1
-%configure --enable-udev --enable-nouveau-experimental-api --disable-libkms
+%configure --enable-udev --enable-nouveau-experimental-api --enable-libkms
 make %{?_smp_mflags}
 # make -C tests %{?_smp_mflags}
 
@@ -79,6 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %{_libdir}/libdrm.so.2
 %{_libdir}/libdrm.so.2.4.0
+%{_libdir}/libkms.so.1
+%{_libdir}/libkms.so.1.0.0
 %{_libdir}/libdrm_intel.so.1
 %{_libdir}/libdrm_intel.so.1.0.0
 %{_libdir}/libdrm_radeon.so.1
@@ -92,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
+%{_includedir}/libkms/libkms.h
 %{_includedir}/libdrm/drm.h
 %{_includedir}/libdrm/drm_mode.h
 %{_includedir}/libdrm/drm_sarea.h
@@ -102,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/nouveau
 %{_includedir}/nouveau/nouveau_*.h
 %{_libdir}/libdrm.so
+%{_libdir}/libkms.so
 %{_libdir}/libdrm_intel.so
 %{_libdir}/libdrm_radeon.so
 %{_libdir}/libdrm_nouveau.so
@@ -109,8 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_intel.pc
 %{_libdir}/pkgconfig/libdrm_radeon.pc
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
+%{_libdir}/pkgconfig/libkms.pc
 
 %changelog
+* Sat May 29 2010 Dave Airlie <airlied@redhat.com> 2.4.21-0.1
+- new upstream git snapshot
+
 * Thu Apr 08 2010 Dave Airlie <airlied@redhat.com> 2.4.20-1
 - upstream release - includes all header file fixes
 

sources

@@ -1 +1 @@
-3c56e03172b236e14905ef9a68ba2f97  libdrm-2.4.20.tar.bz2
+8c784ed7c79d39048eca2c1bcc3696c0  libdrm-20100529.tar.bz2