commit e8457fa5aa057d52963c2414eb165f5365786583
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 10 09:49:59 2019 +0000
Enable boolean requires and appdata for el8
xorg-x11-drv-nvidia.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4eb0d25..c0dbb77 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -52,7 +52,7 @@ Requires(postun): ldconfig
Requires(post): grubby
Requires: which
Requires: nvidia-settings%{?_isa} = %{?epoch}:%{version}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# AppStream metadata generation
BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
@@ -110,7 +110,7 @@ Summary: CUDA driver for %{name}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: nvidia-persistenced%{?_isa} = %{?epoch}:%{version}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Suggests: nvidia-modprobe%{?_isa} = %{?epoch}:%{version}
# Boolean dependencies are only fedora
%ifarch x86_64
@@ -155,7 +155,7 @@ Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Requires: egl-wayland%{?_isa} >= 1.0.0
%else
Requires: egl-wayland >= 1.0.0
@@ -163,7 +163,7 @@ Requires: egl-wayland >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
Requires: vulkan-filesystem
%else
Requires: vulkan-loader%{?_isa}
@@ -324,7 +324,7 @@ cat > %{buildroot}%{rpmmacrodir}/macros.%{name}-kmodsrc<<
EOF
%nvidia_kmodsrc_version %{version}
EOF
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/appdata/
install -pm 0644 %{SOURCE8} %{buildroot}%{_datadir}/appdata/
@@ -408,7 +408,7 @@ fi ||:
%{_udevrulesdir}/10-nvidia.rules
%{_udevrulesdir}/60-nvidia.rules
%{_unitdir}/nvidia-fallback.service
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
%{_datadir}/appdata/%{name}.metainfo.xml
%{_datadir}/pixmaps/%{name}.png
%endif