rpms/libdrm/devel libdrm.spec,1.94,1.95 sources,1.31,1.32

[Dave Airlie]

Author: airlied

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

Modified Files:
	libdrm.spec sources 
Log Message:
* Fri Mar 19 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.19-1
- upstream release 2.4.19 + fixes up until git c1c8bff



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- libdrm.spec	19 Feb 2010 03:28:21 -0000	1.94
+++ libdrm.spec	25 Mar 2010 03:55:32 -0000	1.95
@@ -1,8 +1,8 @@
-%define gitdate 20091221
+# %define gitdate 20100217
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.18
+Version: 2.4.19
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRequires: libudev-devel
 
 Source2: 91-drm-modeset.rules
 
+# git fixes since 2.4.19
+Patch0: libdrm-2.4.19-git-c1c8bbf.patch
 # hardcode the 666 instead of 660 for device nodes
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
@@ -44,12 +46,13 @@ Direct Rendering Manager development pac
 %prep
 #%setup -q -n %{name}-%{gitdate}
 %setup -q 
+%patch0 -p1 -b .git-updates
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 
 %build
 autoreconf -v --install || exit 1
-%configure --enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api
+%configure --enable-udev --enable-nouveau-experimental-api --disable-libkms
 make %{?_smp_mflags}
 # make -C tests %{?_smp_mflags}
 
@@ -66,7 +69,7 @@ find $RPM_BUILD_ROOT -type f -name '*.la
 find $RPM_BUILD_ROOT -type f -name '*_drm.h' | xargs rm -f -- || :
 for i in drm.h drm_mode.h drm_sarea.h r300_reg.h via_3d_reg.h
 do
-rm -f $RPM_BUILD_ROOT/usr/include/drm/$i
+rm -f $RPM_BUILD_ROOT/usr/include/libdrm/$i
 done
 
 %clean
@@ -93,9 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
-%{_includedir}/intel_bufmgr.h
-%{_includedir}/drm/radeon*.h
-%{_includedir}/drm/nouveau_drmif.h
+%{_includedir}/libdrm/intel_bufmgr.h
+%{_includedir}/libdrm/radeon*.h
+%{_includedir}/libdrm/nouveau_drmif.h
 %dir %{_includedir}/nouveau
 %{_includedir}/nouveau/nouveau_*.h
 %{_libdir}/libdrm.so
@@ -108,8 +111,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Mar 19 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.19-1
+- upstream release 2.4.19 + fixes up until git c1c8bff
+
 * Fri Feb 19 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.18-1
-- Upstream release 2.4.18
+- upstream release 2.4.18
+
+* Wed Feb 17 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.18-0.1
+- rebase to pre-snapshot of 2.4.18
 
 * Fri Feb 12 2010 Adam Jackson <ajax at redhat.com> 2.4.17-3
 - Own %%{_includedir}/nouveau (#561317)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 Feb 2010 03:28:21 -0000	1.31
+++ sources	25 Mar 2010 03:55:32 -0000	1.32
@@ -1 +1 @@
-d2b5fbfd37742af7d2169f7d26ce3007  libdrm-2.4.18.tar.bz2
+c2699b5d8ebc9e47fb56da15f460107f  libdrm-2.4.19.tar.bz2