X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=7c3e278debf514bc6c02e2312feabc608e4ef3bf;hp=6d16be461634a4a64ab8aeda58309974325a7877;hb=354edd7d8f5eb3346a6eabe2c55ac3b69ca05c75;hpb=27c19ae8b14801ee205c0a29c49543906df2f161 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 6d16be4..7c3e278 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,15 +1,11 @@ # TODO # - should -libs Require main package? -# - solve this (shouldn't there be some obsoletes?): -# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 -# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 # # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs %bcond_with force_userspace # force userspace build (useful if alt_kernel is set) -%bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers %bcond_with verbose # verbose build (V=1) %if "%{_alt_kernel}" != "%{nil}" @@ -22,25 +18,26 @@ # nothing to be placed to debuginfo package %define _enable_debug_packages 0 %endif +%define no_install_post_check_so 1 -%define pname xorg-driver-video-nvidia -%define rel 3 - +%define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname} -Version: 195.36.24 -Release: %{rel}%{?with_multigl:.mgl} +Version: 290.10 +Release: 8 Epoch: 1 License: nVidia Binary Group: X11 -Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run -# Source0-md5: 97d3e5f69707092aa643fb901bb94003 -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: 9d58114ed8c89cd66fbaccad0c997ee8 +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: 50319a4b3818c12c9c7243525e0e6316 +Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: cebfba9a7e91716a06c66bb5b38d9661 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in +Source4: 10-nvidia.conf +Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html @@ -51,10 +48,11 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia -Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} +Requires: %{pname}-libs = %{epoch}:%{version}-%{release} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 7.0 +Requires: xorg-xserver-server(videodrv-abi) <= 11.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia @@ -62,7 +60,7 @@ Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLcore.so.1 +%define _noautoreqdep libGL.so.1 %description This driver set adds improved 2D functionality to the Xorg X server as @@ -107,16 +105,10 @@ Requires(post,postun): /sbin/ldconfig Requires: libvdpau >= 0.3 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 -%if %{without multigl} -Obsoletes: Mesa -%endif Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-OpenGL-core < 1:7.0.0 Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 -%if %{without multigl} -Conflicts: Mesa-libGL -%endif %description libs NVIDIA OpenGL (GL and GLX only) implementation libraries. @@ -129,7 +121,7 @@ Summary: OpenGL (GL and GLX) header files Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries -Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} +Requires: %{pname}-libs = %{epoch}:%{version}-%{release} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -153,7 +145,7 @@ Summary: Static XvMCNVIDIA library Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA Group: X11/Development/Libraries -Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} +Requires: %{pname}-devel = %{epoch}:%{version}-%{release} %description static Static XvMCNVIDIA library. @@ -177,7 +169,7 @@ 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 Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System -Requires: %{pname} = %{epoch}:%{version}-%{rel} +Requires: %{pname} = %{epoch}:%{version}-%{release} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs @@ -195,12 +187,12 @@ Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez. Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Release: %{rel}@%{_kernel_ver_str} +Release: %{release}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel} -Requires: %{pname} = %{epoch}:%{version}-%{rel} +Requires: %{pname} = %{epoch}:%{version}-%{release} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -219,21 +211,21 @@ sterownik nVidii dla Xorg/XFree86. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{version}-pkg* +rm -rf NVIDIA-Linux-x86*-%{version}* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0 +%setup -qDT -n NVIDIA-Linux-x86-%{version} %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32 %endif %patch0 -p1 %patch1 -p1 -echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild +echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build %if %{with kernel} -cd usr/src/nv +cd kernel ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -248,79 +240,80 @@ mv nv-kernel.o{,.bin} rm -rf $RPM_BUILD_ROOT %if %{with userspace} -install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} -%if %{with multigl} -install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} -%endif - -install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -cp -a usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} -cp -a usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \ + $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ + $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} + +install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} +cp -p nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} +cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors + +install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d +install %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d +sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-modules.conf for f in \ - usr/lib/tls/libnvidia-tls.so.%{version} \ - usr/lib/libnvidia-cfg.so.%{version} \ - usr/lib/libGL{,core}.so.%{version} \ - usr/lib/libcuda.so.%{version} \ - usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ + libGL.so.%{version} \ + libOpenCL.so.1.0.0 \ + libXvMCNVIDIA.so.%{version} \ + libcuda.so.%{version} \ + libnvcuvid.so.%{version} \ + libnvidia-cfg.so.%{version} \ + libnvidia-compiler.so.%{version} \ + libnvidia-glcore.so.%{version} \ + libnvidia-ml.so.%{version} \ + tls/libnvidia-tls.so.%{version} \ ; do -%if %{without multigl} - install -p $f $RPM_BUILD_ROOT%{_libdir} -%else install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia -%endif done -cp -a usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} -install -p usr/lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau +cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}/nvidia +install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau + +install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia +ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so +install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers +install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia +ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so -install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions -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 +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/nvidia +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia -cp -a usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL -cp -a usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda +cp -p 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 ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 -%if %{with multigl} +%ifarch %{x8664} +echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf +echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf +%else echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf +echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf +%endif # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 -ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so - -ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 - -ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so -%else -# OpenGL ABI for Linux compatibility -ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 -ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so - -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1 - -ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so -%endif +ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so +ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so +ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA.so +ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so +ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so %endif %if %{with kernel} -%install_kernel_modules -m usr/src/nv/nvidia -d misc +%install_kernel_modules -m kernel/nvidia -d misc %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} -sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \ +sed -e ' + s|@@prefix@@|%{_prefix}|g; + s|@@libdir@@|%{_libdir}|g; + s|@@includedir@@|%{_includedir}|g; + s|@@version@@|%{version}|g' < %{SOURCE3} \ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc %clean @@ -330,30 +323,11 @@ rm -rf $RPM_BUILD_ROOT cat << 'EOF' NOTE: You must also install kernel module for this driver to work kernel-video-nvidia-%{version} - kernel-desktop-video-nvidia-%{version} - kernel-laptop-video-nvidia-%{version} - kernel-vanilla-video-nvidia-%{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 -%else -/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 -%endif -%post libs -/sbin/ldconfig -/sbin/ldconfig -N %{_libdir}/vdpau - -%postun libs -/sbin/ldconfig -/sbin/ldconfig -N %{_libdir}/vdpau +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %post -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} @@ -364,44 +338,44 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %if %{with userspace} %files %defattr(644,root,root,755) -%doc LICENSE -%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample} -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* -%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so -%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.* -%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so +%doc LICENSE NVIDIA_Changelog README.txt +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.* +%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1 +%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so.* +%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libglx.so +%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so +%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf +%{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf %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 %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/nvidia.icd +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf %dir %{_libdir}/nvidia %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.* -%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so +%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so %attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 -%attr(755,root,root) %{_libdir}/libcuda.so %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libcuda.so +%attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvcuvid.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* -%else -%attr(755,root,root) %{_libdir}/libGL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libGL.so.1 -# symlink for binary apps which fail to conform Linux OpenGL ABI -# (and dlopen libGL.so instead of libGL.so.1) -%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}/libXvMCNVIDIA.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1 -%attr(755,root,root) %{_libdir}/libcuda.so -%attr(755,root,root) %{_libdir}/libcuda.so.*.* -%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* -%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%endif %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 @@ -412,25 +386,23 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h -%{_includedir}/cuda -%if %{with multigl} -%attr(755,root,root) %{_libdir}/libGL.so -%endif +%attr(755,root,root) %{_libdir}/nvidia/libGL.so %{_pkgconfigdir}/gl.pc %files static %defattr(644,root,root,755) -%{_libdir}/libXvMCNVIDIA.a +%{_libdir}/nvidia/libXvMCNVIDIA.a %files doc %defattr(644,root,root,755) -%doc usr/share/doc/html/* +%doc html/* %files progs %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh %attr(755,root,root) %{_bindir}/nvidia-settings +%attr(755,root,root) %{_bindir}/nvidia-smi %attr(755,root,root) %{_bindir}/nvidia-xconfig -%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh %{_desktopdir}/nvidia-settings.desktop %{_mandir}/man1/nvidia-*