SPECS: kernel24-video-nvidia.spec - upgraded to 8178, - added desk...

[gotar]

Author: gotar                        Date: Sat Dec 24 16:13:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- upgraded to 8178,
- added desktop, pixmap, manpages and more docs.

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

---- Diffs:

================================================================
Index: SPECS/kernel24-video-nvidia.spec
diff -u SPECS/kernel24-video-nvidia.spec:1.19 SPECS/kernel24-video-nvidia.spec:1.20
--- SPECS/kernel24-video-nvidia.spec:1.19	Wed Nov  2 20:11:16 2005
+++ SPECS/kernel24-video-nvidia.spec	Sat Dec 24 17:13:06 2005
@@ -7,7 +7,7 @@
 %bcond_with	tls		# install (userspace) libraries with TLS support
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		7667
+%define		_nv_rel		8178
 %define		_min_x11	6.7.0
 %define		_nv_pkg		pkg0
 %define		_kernelsrcdir 	/usr/src/linux-2.4
@@ -23,7 +23,7 @@
 Vendor:		nVidia Corp.
 Group:		Base/Kernel
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-%{_nv_pkg}.run
-# Source0-md5:	1d062204da2902ae86154a03e1a40204
+# Source0-md5:	6c8081bfde4a806a487efc2a9a1ff016
 URL:		http://www.nvidia.com/object/linux.html
 %{?with_dist_kernel:BuildRequires:	kernel24-headers >= 2.4.0 }
 %{?with_dist_kernel:BuildRequires:	kernel24-headers < 2.5.0 }
@@ -147,12 +147,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT{%{_libdir}/modules/{drivers,extensions},/usr/%{_lib}}
+install -d $RPM_BUILD_ROOT{%{_libdir}/modules/{drivers,extensions},/usr/%{_lib}} \
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/man1}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 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}
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/modules/extensions
 
@@ -166,6 +168,11 @@
 # OpenGL ABI for Linux compatibility
 ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
+
+sed 's at __.*S_PATH__/@@' usr/share/applications/nvidia-settings.desktop > $RPM_BUILD_ROOT%{_desktopdir}/nvidia-settings.desktop
+install usr/share/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+gunzip -c usr/share/man/man1/nvidia-settings.1.gz > $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1
+gunzip -c usr/share/man/man1/nvidia-xconfig.1.gz > $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-xconfig.1
 %endif
 
 cd usr/src/nv/
@@ -206,16 +213,19 @@
 %files -n X11-driver-nvidia24
 %defattr(644,root,root,755)
 %doc LICENSE
-%doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
+%doc usr/share/doc/{html,Copyrights,README.txt,NVIDIA_Changelog,XF86Config.sample}
+%{_mandir}/man1/*
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-*.so.*.*.*
 %attr(755,root,root) /usr/%{_lib}/libGL.so.1
 %attr(755,root,root) /usr/%{_lib}/libGL.so
 %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
+%{_desktopdir}/*
+%{_pixmapsdir}/*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -224,6 +234,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/12/24 16:13:06  gotar
+- upgraded to 8178,
+- added desktop, pixmap, manpages and more docs.
+
 Revision 1.19  2005/11/02 19:11:16  arekm
 - up to 7667 (by Michal Abramowicz)
 
================================================================

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