SPECS: xorg-driver-video-nvidia.spec - added nvidia-xconfig, man ...

[aflinta]

Author: aflinta                      Date: Mon May  1 11:51:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
 - added nvidia-xconfig, man pages, html docs
 - added desktp shortcut for nvidia-settings
 - release 0.2 

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.68 SPECS/xorg-driver-video-nvidia.spec:1.69
--- SPECS/xorg-driver-video-nvidia.spec:1.68	Wed Apr 12 14:15:40 2006
+++ SPECS/xorg-driver-video-nvidia.spec	Mon May  1 13:51:45 2006
@@ -8,10 +8,12 @@
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 #
+%define		no_install_post_strip 1
+#
 %define		_nv_ver		1.0
 %define		_nv_rel		8756
 %define		_min_x11	6.7.0
-%define		_rel		0.1
+%define		_rel		0.2
 #
 %define		need_x86	0
 %define		need_x8664	0
@@ -45,6 +47,7 @@
 %endif
 #Patch0:	X11-driver-nvidia-gcc34.patch
 Patch1:		X11-driver-nvidia-GL.patch
+Patch2:		X11-driver-nvidia-desktop.patch
 # http://www.minion.de/files/1.0-6629/
 URL:		http://www.nvidia.com/object/linux.html
 %if %{with kernel}
@@ -184,6 +187,7 @@
 %endif
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build
@@ -226,9 +230,13 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
-	$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir}}
+	$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/nvidia-{settings,xconfig} $RPM_BUILD_ROOT%{_bindir}
+install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install usr/share/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 for f in \
 	usr/lib/tls/libnvidia-tls.so.%{version}		\
@@ -302,7 +310,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
 # OpenGL ABI for Linux compatibility
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGL.so.1
@@ -338,8 +346,11 @@
 
 %files progs
 %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
+%{_desktopdir}/nvidia-settings.desktop
+%{_mandir}/man1/nvidia-*
+%{_pixmapsdir}/nvidia-settings.png
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -348,6 +359,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
 Revision 1.68  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia.spec?r1=1.68&r2=1.69&f=u