libdrm: update to 2.4.20

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@908 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libd/libdrm/libdrm-vl.spec

@@ -3,24 +3,26 @@
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
-Version: 2.4.19
-Release: 2%{?_dist_release}
+Version: 2.4.20
+Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
+
 Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2: 91-drm-modeset.rules
+Patch3: libdrm-make-dri-perms-okay.patch
+Patch10: libdrm-2.4.16-no-pthread-stubs.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig automake autoconf libtool
 BuildRequires: libxcb-devel
 BuildRequires: udev
 BuildRequires: kernel-headers >= 2.6.27-1
 
-Source2: 91-drm-modeset.rules
-
-Patch3: libdrm-make-dri-perms-okay.patch
-
-Patch10: libdrm-2.4.16-no-pthread-stubs.patch
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Direct Rendering Manager runtime library
@@ -72,15 +74,15 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
-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
+for i in 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
@@ -100,20 +102,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdrm_radeon.so.*
 %{_libdir}/libdrm_nouveau.so.*
 %{_libdir}/libkms.so.*
-/lib/udev/rules.d/91-drm-modeset.rules
+%{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/drm
-%dir %{_includedir}/nouveau
-%dir %{_includedir}/libkms
-# FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
-%{_includedir}/intel_bufmgr.h
-%{_includedir}/drm/radeon*.h
-%{_includedir}/drm/nouveau_*.h
+%dir %{_includedir}/libdrm
+%{_includedir}/libdrm/drm.h
+%{_includedir}/libdrm/drm_mode.h
+%{_includedir}/libdrm/drm_sarea.h
+%{_includedir}/libdrm/intel_bufmgr.h
+%{_includedir}/libdrm/radeon*.h
+%{_includedir}/libdrm/nouveau_drmif.h
+%{_includedir}/libdrm/*_drm.h
+%dir %{_includedir}/nouveau
 %{_includedir}/nouveau/nouveau_*.h
+%dir %{_includedir}/libkms
 %{_includedir}/libkms/libkms.h
 %{_libdir}/libdrm.so
 %{_libdir}/libdrm_intel.so
@@ -134,6 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdrm_intel.so.*
 %{_libdir}/libdrm_radeon.so.*
 %{_libdir}/libdrm_nouveau.so.*
+%{_libdir}/libkms.so.*
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
@@ -141,13 +147,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdrm_intel.so
 %{_libdir}/libdrm_radeon.so
 %{_libdir}/libdrm_nouveau.so
+%{_libdir}/libkms.so
 %{_libdir}/pkgconfig/libdrm.pc
+%{_libdir}/pkgconfig/libkms.pc
 %{_libdir}/pkgconfig/libdrm_intel.pc
 %{_libdir}/pkgconfig/libdrm_radeon.pc
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 %endif
 
 %changelog
+* Fri Apr 30 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.20-1
+- new upstream release
+- move include files to new location which are not conflict with kernel.
+
 * Tue Mar 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.19-2
 - add libkms