SPECS: kernel24-video-nvidia.spec - included programs and O: X11-d...

[gotar]

Author: gotar                        Date: Sat Dec 24 21:17:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- included programs and O: X11-driver-nvidia-progs if --with userspace,
- proper _mandir.

---- Files affected:
SPECS:
   kernel24-video-nvidia.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/kernel24-video-nvidia.spec
diff -u SPECS/kernel24-video-nvidia.spec:1.20 SPECS/kernel24-video-nvidia.spec:1.21
--- SPECS/kernel24-video-nvidia.spec:1.20	Sat Dec 24 17:13:06 2005
+++ SPECS/kernel24-video-nvidia.spec	Sat Dec 24 22:17:48 2005
@@ -43,6 +43,7 @@
 %define		specflags_ia32	-O1
 %define		_noautoreqdep	libGL.so.1 libGLcore.so.1
 %define		_prefix		/usr/X11R6
+%define		_mandir		%{_prefix}/man
 
 %description
 nVidia Architecture support for Linux kernel.
@@ -99,6 +100,7 @@
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
+Obsoletes:	X11-driver-nvidia-progs
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 
 %description -n X11-driver-nvidia24
@@ -148,10 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{%{_libdir}/modules/{drivers,extensions},/usr/%{_lib}} \
-	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/man1}
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/man1,%{_bindir}}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
+install usr/bin/nvidia-{settings,xconfig} $RPM_BUILD_ROOT%{_bindir}
 install usr/lib%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/lib/libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -215,6 +218,7 @@
 %doc LICENSE
 %doc usr/share/doc/{html,Copyrights,README.txt,NVIDIA_Changelog,XF86Config.sample}
 %{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
@@ -234,6 +238,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2005/12/24 21:17:48  gotar
+- included programs and O: X11-driver-nvidia-progs if --with userspace,
+- proper _mandir.
+
 Revision 1.20  2005/12/24 16:13:06  gotar
 - upgraded to 8178,
 - added desktop, pixmap, manpages and more docs.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel24-video-nvidia.spec?r1=1.20&r2=1.21&f=u