- updated to 260.19.12

- cuda headers dropped upstream

Changed files:
    xorg-driver-video-nvidia.spec -> 1.290

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index f9838f1327f885ca7c9f0a290a94da4c9210a9bb..5e50cdcad3c2535f3a5f5a8cd7013015286d5b44 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -25,21 +25,21 @@
 %define                no_install_post_check_so 1
 
 %define                pname           xorg-driver-video-nvidia
 %define                no_install_post_check_so 1
 
 %define                pname           xorg-driver-video-nvidia

-%define                rel             8%{?with_multigl:.mgl}
+%define                rel             1%{?with_multigl:.mgl}

 
 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}
 
 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:       256.53
+Version:       260.19.12

 Release:       %{rel}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
 Release:       %{rel}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run

-# Source0-md5: 21fe3fe0afed7818b7adf383477b2155
+# Source0-md5: 8bcefb2423908160d3676200650ad5c9

 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run

-# Source1-md5: 73f08a19e00d05165cbbfc74e2fa4bdd
+# Source1-md5: 111da94be1ea21c0531b6e1c45d01b9b

 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Patch0:                X11-driver-nvidia-GL.patch
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Patch0:                X11-driver-nvidia-GL.patch


@@ -250,7 +250,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 
 %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{%{_includedir}/GL,%{_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}
        $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}


@@ -288,7 +288,6 @@ install -p libnvidia-wfb.so.%{version} \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
 cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
 cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL

-cp -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda

 
 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 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


@@ -414,7 +413,6 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 %{_includedir}/GL/glext.h
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glxext.h
 %{_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
 %if %{with multigl}
 %attr(755,root,root) %{_libdir}/libGL.so
 %endif