diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf new file mode 100644 index 0000000..c2071f1 --- /dev/null +++ b/00-ignoreabi.conf @@ -0,0 +1,3 @@ +Section "ServerFlags" + Option "IgnoreABI" "True" +EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d09002a..fda96d3 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: 337.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -22,6 +22,7 @@ Source3: nvidia-xorg.conf Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf Source7: alternate-install-present +Source8: 00-ignoreabi.conf BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -234,6 +235,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -400,6 +402,7 @@ fi %dir %{_sysconfdir}/nvidia %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf +%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -477,6 +480,9 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Wed Jun 04 2014 Leigh Scott - 1:337.25-2 +- Add support for IgnoreABI xorg option + * Sat May 31 2014 Leigh Scott - 1:337.25-1 - Update to 337.25 - adds support for X.org xserver ABI 18 (xorg-server 1.16)