Author: zytek Date: Wed May 30 16:40:04 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - remove kernel bcond, use only dist_kernel - C: kernel-drm - move modules to kernel/drivers/char/drm - rel up, builds, needs testing
---- Files affected: SPECS: kernel-video-drm.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/kernel-video-drm.spec diff -u SPECS/kernel-video-drm.spec:1.29 SPECS/kernel-video-drm.spec:1.30 --- SPECS/kernel-video-drm.spec:1.29 Mon May 28 01:51:29 2007 +++ SPECS/kernel-video-drm.spec Wed May 30 18:39:58 2007 @@ -13,7 +13,7 @@ %undefine with_dist_kernel %endif -%define _rel 2 +%define _rel 3 Summary: Linux driver for DRM Summary(pl.UTF-8): Sterownik dla Linuksa do DRM Name: kernel%{_alt_kernel}-video-drm @@ -24,16 +24,15 @@ Source0: drm-%{version}.tar.bz2 # Source0-md5: a66e980f567ec3e06dc606b6d8a6266c URL: http://dri.freedesktop.org/wiki/DRM -%if %{with kernel} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} BuildRequires: rpmbuild(macros) >= 1.379 -%endif Requires(post,postun): /sbin/depmod %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel -%endif Obsoletes: kernel-drm = %{_kernel_ver_str} +Conflicts: kernel-drm = %{_kernel_ver_str} +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -48,7 +47,6 @@ %setup -q -n drm %build -%if %{with kernel} chmod u+x scripts/create_linux_pci_lists.sh cd linux-core cat ../shared-core/drm_pciids.txt | ../scripts/create_linux_pci_lists.sh @@ -57,14 +55,11 @@ mv Makefile.new Makefile export DRMSRCDIR=`pwd` %build_kernel_modules -m drm,mga,radeon,via,i810,nouveau,savage,i915,nv,sis,mach64,r128,tdfx -%endif %install rm -rf $RPM_BUILD_ROOT -%if %{with kernel} -%install_kernel_modules -m linux-core/{drm,mga,radeon,via,i810,nouveau,savage,i915,nv,sis,mach64,r128,tdfx} -d misc -%endif +%install_kernel_modules -m linux-core/{drm,mga,radeon,via,i810,nouveau,savage,i915,nv,sis,mach64,r128,tdfx} -d kernel/drivers/char/drm %clean rm -rf $RPM_BUILD_ROOT @@ -75,11 +70,9 @@ %postun -n kernel%{_alt_kernel}-video-drm %depmod %{_kernel_ver} -%if %{with kernel} %files -n kernel%{_alt_kernel}-video-drm %defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/*.ko* -%endif +/lib/modules/%{_kernel_ver}/kernel/drivers/char/drm %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -87,6 +80,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2007/05/30 16:39:58 zytek +- remove kernel bcond, use only dist_kernel +- C: kernel-drm +- move modules to kernel/drivers/char/drm +- rel up, builds, needs testing + Revision 1.29 2007/05/27 23:51:29 zytek - install modules in misc rather than nonexistent video subdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel-video-drm.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit