Author: sparky Date: Mon Nov 13 12:20:01 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %build_kernel_modules, %install_kernel_modules (not tested)
---- Files affected: SPECS: X11-driver-nvidia-legacy.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/X11-driver-nvidia-legacy.spec diff -u SPECS/X11-driver-nvidia-legacy.spec:1.31 SPECS/X11-driver-nvidia-legacy.spec:1.32 --- SPECS/X11-driver-nvidia-legacy.spec:1.31 Tue Nov 7 23:21:10 2006 +++ SPECS/X11-driver-nvidia-legacy.spec Mon Nov 13 13:19:56 2006 @@ -190,35 +190,7 @@ %if %{with kernel} cd usr/src/nv/ ln -sf Makefile.kbuild Makefile -for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do - if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then - exit 1 - fi - rm -rf o - install -d o/include/linux - ln -sf %{_kernelsrcdir}/config-$cfg o/.config - ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers - ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h -%if %{with dist_kernel} - %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts -%else - touch o/include/config/MARKER - ln -sf %{_kernelsrcdir}/scripts o/scripts -%endif - %{__make} -C %{_kernelsrcdir} clean \ - RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - %{__make} -C %{_kernelsrcdir} modules \ - CC="%{__cc}" CPP="%{__cpp}" \ - SYSSRC=%{_kernelsrcdir} \ - SYSOUT=$PWD/o \ - M=$PWD O=$PWD/o \ - %{?with_verbose:V=1} - mv nvidia.ko nvidia-$cfg.ko -done +%build_kernel_modules -m nvidia %endif %install @@ -259,14 +231,7 @@ ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so %if %{with kernel} -cd usr/src/nv/ -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc -install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko -%if %{with smp} && %{with dist_kernel} -install nvidia-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko -%endif +%install_kernel_modules -m usr/src/nv/nvidia -d misc %endif %clean @@ -358,6 +323,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2006/11/13 12:19:56 sparky +- use %build_kernel_modules, %install_kernel_modules (not tested) + Revision 1.31 2006/11/07 22:21:10 glen - do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly @@ -640,7 +608,7 @@ Revision 1.51 2004/04/08 10:51:52 pluto - merged with kernel-video-nvidia. -- %%build complaint with 2.6.x. +- %build complaint with 2.6.x. Revision 1.50 2004/04/03 22:33:26 gotar - s/glibc-tls/glibc(tls)/ @@ -718,7 +686,7 @@ Revision 1.29 2002/05/31 20:52:23 filon - added missing files (docs and libXvNVIDIA.a) -- new %%doc +- new %doc Revision 1.28 2002/05/29 07:40:32 wiget - revert last change and add Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit