diff --git a/.gitignore b/.gitignore index c017971..d9b0be3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-260.19.21-no-compat32.run -NVIDIA-Linux-x86-260.19.21.run +NVIDIA-Linux-x86_64-260.19.29.run +NVIDIA-Linux-x86-260.19.29.run diff --git a/sources b/sources index a3ff0df..4780437 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9db612fb5679249627d52bfff0e16f4f NVIDIA-Linux-x86_64-260.19.21-no-compat32.run -2ec917f51e752802646920e9bcd747e7 NVIDIA-Linux-x86-260.19.21.run +0539f7af29e19971745811e971b074f8 NVIDIA-Linux-x86_64-260.19.29.run +e982a05a85c68130acfe1d48086250e3 NVIDIA-Linux-x86-260.19.29.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index e96a49d..1b75f73 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 260.19.21 +Version: 260.19.29 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -16,7 +16,7 @@ Group: User Interface/X Hardware Support License: Redistributable, no modification permitted URL: http://www.nvidia.com/ Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run Source2: 00-nvidia.conf Source3: nvidia-xorg.conf #Source5: nvidia-init @@ -233,7 +233,8 @@ install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so # Remove execstack needs on F-12 and laters -%if 0%{?fedora} >= 12 || 0%{?rhel} > 5 +#if 0%{?fedora} >= 12 || 0%{?rhel} > 5 +%if 0 find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';' %ifarch x86_64 execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi @@ -347,6 +348,9 @@ fi ||: %changelog +* Tue Dec 14 2010 Nicolas Chauvet - 1:260.19.29-1 +- Update to 260.19.29 + * Thu Nov 11 2010 Nicolas Chauvet - 1:260.19.21-1 - Update to 260.19.21