rpms/libdrm/devel libdrm.spec,1.99,1.100 sources,1.35,1.36

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12501

Modified Files:
	libdrm.spec sources 
Log Message:
* Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.4.21-1
- libdrm 2.4.21



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- libdrm.spec	12 Jun 2010 11:27:29 -0000	1.99
+++ libdrm.spec	25 Jun 2010 16:02:23 -0000	1.100
@@ -1,4 +1,4 @@
-%define gitdate 20100612
+# %define gitdate 20100217
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
@@ -7,8 +7,8 @@ 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)
 
@@ -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 --enable-libkms
+%configure --enable-udev --enable-nouveau-experimental-api --disable-libkms
 make %{?_smp_mflags}
 # make -C tests %{?_smp_mflags}
 
@@ -79,8 +79,6 @@ 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
@@ -94,7 +92,6 @@ 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
@@ -105,7 +102,6 @@ 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
@@ -113,14 +109,10 @@ 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 Jun 12 2010 Dave Airlie <airlied at redhat.com> 2.4.21-1
-- new upstream git snapshot
-
-* Sat May 29 2010 Dave Airlie <airlied at redhat.com> 2.4.21-0.1
-- new upstream git snapshot
+* Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.4.21-1
+- libdrm 2.4.21
 
 * Thu Apr 08 2010 Dave Airlie <airlied at redhat.com> 2.4.20-1
 - upstream release - includes all header file fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	12 Jun 2010 11:27:29 -0000	1.35
+++ sources	25 Jun 2010 16:02:23 -0000	1.36
@@ -1 +1,2 @@
-764606d75ef7fbc4ceed60193093595d  libdrm-20100612.tar.bz2
+3c56e03172b236e14905ef9a68ba2f97  libdrm-2.4.20.tar.bz2
+273ed9dad986e3a931649f3d8762ff74  libdrm-2.4.21.tar.bz2