SPECS: X11-driver-nvidia.spec - use %build_kernel_modules, %instal...

[sparky]

Author: sparky                       Date: Mon Nov 13 12:17:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %build_kernel_modules, %install_kernel_modules (not tested)

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.86 -> 1.87) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.86 SPECS/X11-driver-nvidia.spec:1.87
--- SPECS/X11-driver-nvidia.spec:1.86	Fri Nov 10 10:57:38 2006
+++ SPECS/X11-driver-nvidia.spec	Mon Nov 13 13:17:22 2006
@@ -58,7 +58,7 @@
 %endif
 BuildRequires:	%{kgcc_package}
 #BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.326
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
@@ -206,35 +206,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
@@ -280,14 +252,7 @@
 %endif
 
 %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
@@ -385,6 +350,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2006/11/13 12:17:22  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.86  2006/11/10 09:57:38  mguevara
 - up to 1.0.9629-1
 
@@ -768,29 +736,29 @@
 
 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
+- revert last change and add Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
 
 Revision 1.26  2002/05/23 16:35:13  wiget
-2960
+- 2960
 
 Revision 1.25  2002/05/17 09:07:18  wiget
-move libGL.so to main package, release 2
+- move libGL.so to main package, release 2
 
 Revision 1.24  2002/04/08 16:50:23  wiget
-start update to 2880
+- start update to 2880
 
 Revision 1.23  2002/03/11 01:50:59  jack
-Updated to 2802
+- Updated to 2802
 
 Revision 1.22  2002/02/22 23:28:39  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
   Group field using gettext).
 
 Revision 1.21  2002/01/18 02:12:15  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.20  2002/01/03 23:03:20  gotar
 - s/NVIDIA/nVidia/
@@ -854,7 +822,7 @@
 - added XFree86-Xserver to Requires.
 
 Revision 1.1  2001/02/15 22:50:18  misiek
-renamed
+- renamed
 
 Revision 1.8  2001/01/19 07:44:23  mkochano
 - Updated to 0.9.6.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.spec?r1=1.86&r2=1.87&f=u