Merge branch 'master' into f25

el9
leigh123linux 8 years ago
commit 01510f4f3d

@ -436,7 +436,7 @@ fi ||:
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %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-avoid-glamor.conf
# Comment Xorg abi override # Comment Xorg abi override
config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop

Loading…
Cancel
Save