Fix build on ARM and race with mesa

xorg-x11-drv-nvidia.spec

@@ -8,7 +8,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         331.20
-Release:         4%{?dist}
+Release:         5%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -433,8 +433,12 @@ fi
 %{_nvidia_libdir}/libOpenCL.so
 %{_nvidia_libdir}/libnvidia-compiler.so
 %{_nvidia_libdir}/libnvidia-encode.so
+%{_nvidia_libdir}/libnvidia-ifr.so
+%{_nvidia_libdir}/libnvidia-opencl.so
+%{_nvidia_libdir}/tls/libnvidia-tls.so
+%{_libdir}/vdpau/libvdpau_nvidia.so
 %endif
-%ifarch i686
+%ifarch i686 armv7hl
 %{_nvidia_libdir}/libEGL.so
 %{_nvidia_libdir}/libGLESv1_CM.so
 %{_nvidia_libdir}/libGLESv2.so
@@ -445,15 +449,15 @@ fi
 %{_nvidia_libdir}/libGL.so
 %{_nvidia_libdir}/libnvidia-glcore.so
 %{_nvidia_libdir}/libnvidia-fbc.so
-%{_nvidia_libdir}/libnvidia-ifr.so
 %{_nvidia_libdir}/libnvcuvid.so
 %{_nvidia_libdir}/libnvidia-ml.so
-%{_nvidia_libdir}/libnvidia-opencl.so
-%{_nvidia_libdir}/tls/libnvidia-tls.so
 %{_libdir}/libcuda.so
-%{_libdir}/vdpau/libvdpau_nvidia.so
 
 %changelog
+* Wed Dec 11 2013 Nicolas Chauvet <kwizart@gmail.com> - 1:331.20-5
+- Add filter on libEGL and libGLES to avoid race with mesa
+- Fix build on ARM
+
 * Wed Nov 13 2013 Nicolas Chauvet <kwizart@gmail.com> - 1:331.20-4
 - Revert %%pretrans move - rfbz#3027