9:59 a.m.
commit c9c60e01018db6ce6033c87ccef7822a9b482189
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 09:59:18 2016 +0000
Add conditionals for f24
nvidia-old.conf | 8 ++++++++
xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-old.conf b/nvidia-old.conf
new file mode 100644
index 0000000..9c5e953
--- /dev/null
+++ b/nvidia-old.conf
@@ -0,0 +1,8 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "OutputClass"
+ Identifier "nvidia"
+ MatchDriver "nvidia-drm"
+ Driver "nvidia"
+EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7acd541..b008f57 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,10 +18,12 @@ URL: http://www.nvidia.com/
Source0:
ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1:
ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4:
ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
+Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
+Source8: nvidia-old.conf
Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 00-ignoreabi.conf
@@ -262,6 +264,11 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+%if 0%{?fedora} <= 24
+install -pm 0644 %{SOURCE2} $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
+%endif
# Comment Xorg abi override
#install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
@@ -289,12 +296,16 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia
install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
$RPM_BUILD_ROOT%{_datadir}/nvidia
#Install the output class configuration file - xorg-server >= 1.16
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 25
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g'
$RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
+%if 0%{?fedora} <= 24
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%endif
#Avoid prelink to mess with nvidia libs - rfbz#3258
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
@@ -436,6 +447,9 @@ fi ||:
%config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
+%if 0%{?fedora} <= 24
+%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+%endif
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
# Comment Xorg abi override
#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
@@ -552,6 +566,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-4
+- Add conditionals for f24
+
* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-3
- Fix nvidia.conf