SPECS: X11-driver-nvidia-legacy.spec - merge X11-driver-nvidia cha...

[havner]

Author: havner                       Date: Sat Jul 22 19:03:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge X11-driver-nvidia changes
- rel 3

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.28 SPECS/X11-driver-nvidia-legacy.spec:1.29
--- SPECS/X11-driver-nvidia-legacy.spec:1.28	Sun Jul  2 17:30:19 2006
+++ SPECS/X11-driver-nvidia-legacy.spec	Sat Jul 22 21:03:04 2006
@@ -10,7 +10,7 @@
 %define		_nv_ver		1.0
 %define		_nv_rel		7182
 %define		_min_x11	6.7.0
-%define		_rel		2
+%define		_rel		3
 #####################################
 #
 %define		oldname 	X11-driver-nvidia
@@ -27,6 +27,8 @@
 # Source0-md5:	a7c84815943dc4784a207608abf2e5d6
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
 # Source1-md5:	5a670a73a8887bdc776064aecae8f769
+Source2:	%{oldname}-settings.desktop
+Source3:	%{oldname}-xinitrc.sh
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
 Patch2:		%{name}-verbose.patch
@@ -222,11 +224,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 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}} \
+	$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/share/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+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}
 install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
 install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -243,7 +249,6 @@
 install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 install usr/include/GL/*.h	$RPM_BUILD_ROOT/usr/include/GL
-#install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/modules/extensions/libglx.so
@@ -343,6 +348,9 @@
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%{_desktopdir}/*
+%{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -350,6 +358,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/07/22 19:03:04  havner
+- merge X11-driver-nvidia changes
+- rel 3
+
 Revision 1.28  2006/07/02 15:30:19  hawk
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.28&r2=1.29&f=u