SPECS: xorg-driver-video-nvidia.spec - use %build_kernel_modules, ...

Mon Nov 13 13:24:07 CET 2006

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

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.83 SPECS/xorg-driver-video-nvidia.spec:1.84

--- SPECS/xorg-driver-video-nvidia.spec:1.83	Wed Nov  8 22:26:47 2006
+++ SPECS/xorg-driver-video-nvidia.spec	Mon Nov 13 13:24:02 2006
@@ -52,7 +52,7 @@
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.326
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
@@ -191,35 +191,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
-	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
-	install -d o/include/config
-	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
@@ -262,14 +234,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
@@ -359,6 +324,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2006/11/13 12:24:02  sparky
+- use %build_kernel_modules, %install_kernel_modules (not tested)
+
 Revision 1.83  2006/11/08 21:26:47  aflinta
 - up to official release 9629, it's not beta but xgl doesn't work for me
 
@@ -388,7 +356,7 @@
 - xinitrc for loading nvidia settings on startup
 
 Revision 1.74  2006/08/24 21:56:48  aflinta
- - version 8774, working with xorg 7.1
+- version 8774, working with xorg 7.1
 
 Revision 1.73  2006/08/24 14:47:50  adamg
 - alt_kernel support
@@ -403,9 +371,9 @@
 - version 8762
 
 Revision 1.69  2006/05/01 11:51:45  aflinta
- - added nvidia-xconfig, man pages, html docs
- - added desktp shortcut for nvidia-settings
- - release 0.2
+- added nvidia-xconfig, man pages, html docs
+- added desktp shortcut for nvidia-settings
+- release 0.2
 
 Revision 1.68  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
@@ -414,8 +382,8 @@
 - R: xorg-xserver-server
 
 Revision 1.66  2006/04/09 11:01:00  aflinta
- - added fixes from Lukasz Krotowski
- - updated to version 8756
+- added fixes from Lukasz Krotowski
+- updated to version 8756
 
 Revision 1.65  2006/03/24 21:23:32  aflinta
 - it provides OpenGL, drop X11 requirements, need some work with xorg dependency
@@ -646,7 +614,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)/
@@ -724,29 +692,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/
@@ -810,7 +778,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/xorg-driver-video-nvidia.spec?r1=1.83&r2=1.84&f=u

