SPECS: X11-driver-nvidia.spec - merged

[charles]

Author: charles                      Date: Sat Aug 26 08:24:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.75 SPECS/X11-driver-nvidia.spec:1.76
--- SPECS/X11-driver-nvidia.spec:1.75	Sat Jul 22 20:39:00 2006
+++ SPECS/X11-driver-nvidia.spec	Sat Aug 26 10:24:22 2006
@@ -9,9 +9,9 @@
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		8762
+%define		_nv_rel		8774
 %define		_min_x11	6.7.0
-%define		_rel		3
+%define		_rel		1
 #
 %define		need_x86	0
 %define		need_x8664	0
@@ -38,11 +38,11 @@
 # why not pkg0!?
 %if %{need_x86}
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5:	86bcf4a3a9d441dff9e25b82ec8a6060
+# Source0-md5:	eb01a4372096ee7799e6560cf568c1c2
 %endif
 %if %{need_x8664}
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source1-md5:	73a12a4933c57941a7a8b7c1186f8b93
+# Source1-md5:	5f8d5f8e076d1bb49b460a7aa96f069f
 %endif
 Source2:	%{name}-settings.desktop
 Source3:	%{name}-xinitrc.sh
@@ -237,7 +237,7 @@
 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 usr/share/pixmaps/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}
@@ -371,6 +371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2006/08/26 08:24:22  charles
+- merged
+
 Revision 1.75  2006/07/22 18:39:00  havner
 - desktop+pixmap file
 - xinitrc for loading nvidia settings on startup
================================================================

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