Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv14551 Modified Files: .cvsignore sources xorg-x11-drv-nvidia.spec Log Message: Update to lastest Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 11 Nov 2010 13:07:39 -0000 1.23 +++ .cvsignore 15 Dec 2010 11:04:34 -0000 1.24 @@ -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 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 11 Nov 2010 13:07:39 -0000 1.23 +++ sources 15 Dec 2010 11:04:34 -0000 1.24 @@ -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 Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- xorg-x11-drv-nvidia.spec 11 Nov 2010 13:07:39 -0000 1.47 +++ xorg-x11-drv-nvidia.spec 15 Dec 2010 11:04:34 -0000 1.48 @@ -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 @@ -90,7 +90,11 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries +%if 0%{?fedora} > 10 || 0%{?rhel} > 5 +Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} +%else Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} +%endif #Introduced in F10 when 173xx has forked to legacy serie Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100 Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101 @@ -228,7 +232,8 @@ 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 @@ -329,6 +334,10 @@ %changelog +* Tue Dec 14 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:260.19.29-1 +- Update to 260.19.29 +- Explicitely use %%{_isa} dependency from -devel to -libs + * Thu Nov 11 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:260.19.21-1 - Update to 260.19.21