packages: xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3...

Fri Jun 3 08:04:56 CEST 2011

Author: glen                         Date: Fri Jun  3 06:04:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- doc subpackage, symlinks so concurrent versions can be installed (merges from xorg-driver-video-nvidia); rel 3

---- Files affected:
packages/xorg-driver-video-nvidia-legacy3:
   xorg-driver-video-nvidia-legacy3.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec
diff -u packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.61 packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.62

--- packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec:1.61	Thu Jun  2 20:10:44 2011
+++ packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec	Fri Jun  3 08:04:47 2011
@@ -22,7 +22,7 @@
 %define		no_install_post_check_so	1
 
 %define		pname		xorg-driver-video-nvidia-legacy3
-%define		rel		2
+%define		rel		3
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips (173.14.xx series)
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -159,6 +159,14 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka XvMCNVIDIA.
 
+%package doc
+Summary:	Documentation for NVIDIA Graphics Driver
+Group:		Documentation
+
+%description doc
+NVIDIA Accelerated Linux Graphics Driver README and Installation
+Guide.
+
 %package progs
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(hu.UTF-8):	Eszközök az nVidia grafikus kártyák beállításához
@@ -242,11 +250,11 @@
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
 %endif
 
-install usr/bin/nvidia-{settings,xconfig,bug-report.sh} $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/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
+install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+cp -p usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -p usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 
 for f in \
 	usr/lib/tls/libnvidia-tls.so.%{version}		\
@@ -260,21 +268,22 @@
 done
 %else
 ; do
-	install $f $RPM_BUILD_ROOT%{_libdir}/nvidia
+	install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
 done
-install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+cp -p usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 
-install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
+install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
-install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
-install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -p usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
+ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %if %{with multigl}
 echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
@@ -306,18 +315,11 @@
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
   kernel-video-nvidia-legacy3-%{version}
-  kernel-desktop-video-nvidia-legacy3-%{version}
-  kernel-laptop-video-nvidia-legacy3-%{version}
-  kernel-vanilla-video-nvidia-legacy3-%{version}
-
-Depending on which kernel brand you use.
 
 EOF
-%if %{with multigl}
-if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
-	ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
-fi
-%endif
+/sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
+# until versioned SONAME is built for nvidia_drv.so, update symlink manually
+ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -332,17 +334,20 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
 %if %{with multigl}
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
-%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
 %else
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
 %endif
 %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files libs
+%defattr(644,root,root,755)
 %if %{with multigl}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
 %dir %{_libdir}/nvidia
@@ -353,8 +358,6 @@
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
-%ghost %{_libdir}/xorg/modules/extensions/libglx.so
 %else
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
@@ -384,6 +387,10 @@
 %defattr(644,root,root,755)
 %{_libdir}/libXvMCNVIDIA.a
 
+%files doc
+%defattr(644,root,root,755)
+%doc usr/share/doc/html/*
+
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-settings
@@ -407,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2011/06/03 06:04:47  glen
+- doc subpackage, symlinks so concurrent versions can be installed (merges from xorg-driver-video-nvidia); rel 3
+
 Revision 1.61  2011/06/02 18:10:44  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia-legacy3/xorg-driver-video-nvidia-legacy3.spec?r1=1.61&r2=1.62&f=u

