SPECS (AC-branch): X11-driver-nvidia.spec - HEAD merge

glen glen at pld-linux.org
Tue Mar 13 17:47:17 CET 2007 

Author: glen                         Date: Tue Mar 13 16:47:17 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.78.2.9.2.2 -> 1.78.2.9.2.3) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.2 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.3
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.2	Sat Jan 27 13:19:41 2007
+++ SPECS/X11-driver-nvidia.spec	Tue Mar 13 17:47:12 2007
@@ -1,7 +1,10 @@
 # $Revision$, $Date$
+# TODO
+# - missing CC quotes somewhere: ccache: invalid option -- S
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	up		# without up packages
 %bcond_without	smp		# without smp packages
 %bcond_without	kernel		# without kernel packages
 %bcond_without	incall		# include all tarballs
@@ -16,7 +19,7 @@
 %define		_nv_ver		1.0
 %define		_nv_rel		9746
 %define		_min_x11	6.7.0
-%define		_rel		2
+%define		_rel		3
 #
 %define		need_x86	0
 %define		need_x8664	0
@@ -60,7 +63,7 @@
 %endif
 BuildRequires:	%{kgcc_package}
 #BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.330
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
@@ -204,35 +207,13 @@
 %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
+cat >> Makefile <<'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+	cp $< $@
+EOF
+mv nv-kernel.o{,.bin}
+%build_kernel_modules -m nvidia
 %endif
 
 %install
@@ -240,13 +221,15 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
-	$RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}} \
+	$RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/nvidia-xconfig $RPM_BUILD_ROOT%{_bindir}
 install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install usr/share/man/man1/nvidia-[sx]* $RPM_BUILD_ROOT%{_mandir}/man1
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/nvidia-settings.desktop
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
@@ -279,14 +262,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
@@ -373,8 +349,10 @@
 %defattr(644,root,root,755)
 %doc usr/share/doc/nvidia-settings-user-guide.txt
 %attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-xconfig
 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
+%{_mandir}/man1/*
 %{_pixmapsdir}/*
 %endif
 
@@ -384,6 +362,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.3  2007/03/13 16:47:12  glen
+- HEAD merge
+
 Revision 1.78.2.9.2.2  2007/01/27 12:19:41  charles
 - added modules: libnvidia-wfb.so.%{version} and libwfb.so (symlink)
 - rel. 2
@@ -779,29 +760,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/
@@ -865,7 +846,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.78.2.9.2.2&r2=1.78.2.9.2.3&f=u

More information about the pld-cvs-commit mailing list