[xorg-x11-drv-nvidia/el7] Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora ARM

commit 633251b0286e88d6bad24b9b30a11590af6cdd9a Author: Simone Caronni <negativo17(a)gmail.com&gt; Date: Thu Mar 2 16:35:42 2017 +0100 Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora ARM xorg-x11-drv-nvidia.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a7df13f..145b608 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -23,7 +23,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.39 -Release: 6%{?dist} +Release: 7%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -527,13 +527,18 @@ fi ||: %if 0%{?rhel} < 8 || 0%{?fedora} <= 24 %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} %endif -# It's time that nvidia-settings used gtk3 %ifarch %{arm} %{_nvidia_libdir}/libnvidia-gtk2.so* +%endif +%ifarch x86_64 i686 +%if 0%{?rhel} == 6 +%exclude %{_nvidia_libdir}/libnvidia-gtk3.so* +%{_nvidia_libdir}/libnvidia-gtk2.so* %else %exclude %{_nvidia_libdir}/libnvidia-gtk2.so* %{_nvidia_libdir}/libnvidia-gtk3.so* %endif +%endif #/no_multilib %if 0%{?rhel} > 6 || 0%{?fedora} %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -618,6 +623,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com&gt; - 1:375.39-7 +- Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora ARM. + * Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com&gt; - 1:375.39-6 - Require source built libnvidia-egl-wayland library.