From 8cf25af610672e5761bd37f321f26ae0f23c89ff Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 16 Mar 2020 09:32:06 +0100 Subject: [PATCH 1/4] Obsoletes cuda-drivers --- xorg-x11-drv-nvidia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 54ecf4c..184b479 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -127,6 +127,8 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda #Don't put an epoch here Provides: cuda-drivers = %{version}.100 Provides: cuda-drivers%{?_isa} = %{version}.100 +Obsoletes: cuda-drivers < %{version}.100 +Obsoletes: cuda-drivers%{?_isa} < %{version}.100 Provides: nvidia-driver = %{version}-100 Provides: nvidia-driver%{?_isa} = %{version}-100 Provides: nvidia-drivers = %{version}-100 From 7595636ff12bd9087355d87a79b26cc15de56426 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 7 Apr 2020 18:37:13 +0100 Subject: [PATCH 2/4] Update to 440.82 release --- sources | 2 +- xorg-x11-drv-nvidia.spec | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sources b/sources index c6202ce..672d0eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NVIDIA-Linux-x86_64-440.64.run) = 26156974d9a18456ada329f19e93c2f2abb1c5b12fec47df870a0e5b7788204cf0a745ebfefad6ab50d8f659127722905d5156462d4ce794cc52d796b762bf43 +SHA512 (NVIDIA-Linux-x86_64-440.82.run) = d86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 184b479..302fa06 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -19,8 +19,8 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 440.64 -Release: 2%{?dist} +Version: 440.82 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -128,7 +128,11 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda Provides: cuda-drivers = %{version}.100 Provides: cuda-drivers%{?_isa} = %{version}.100 Obsoletes: cuda-drivers < %{version}.100 -Obsoletes: cuda-drivers%{?_isa} < %{version}.100 +# Comment out due to +#error: line 131: Illegal char ')' (0x29) in: Obsoletes: cuda-drivers(x86-64) < 440.82.100 +#error: line 131: Only package names are allowed in Obsoletes: Obsoletes: cuda-drivers(x86-64) < 440.82.100 +#error: query of specfile /home/leigh/development/fedora-git/xorg-x11-drv-nvidia/xorg-x11-drv-nvidia.spec failed, can't parse +#Obsoletes: cuda-drivers%{?_isa} < %{version}.100 Provides: nvidia-driver = %{version}-100 Provides: nvidia-driver%{?_isa} = %{version}-100 Provides: nvidia-drivers = %{version}-100 @@ -500,11 +504,14 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Tue Apr 07 2020 leigh123linux - 3:440.82-2 +- Update to 440.82 release + * Wed Mar 11 2020 Nicolas Chauvet - 3:440.64-2 - Deal with cuda-drivers insanity * Fri Feb 28 2020 leigh123linux - 3:440.64-1 -- rebuilt +- Update to 440.64 release * Tue Feb 25 2020 Leigh Scott - 3:440.59-3 - Remove 'Disable wayland if gdm is available', gdm has it's own blacklist From 9b4e4b7c7f5da656773db783acf5e9d61bbc5301 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 7 Apr 2020 18:54:38 +0100 Subject: [PATCH 3/4] fix obsoletes --- xorg-x11-drv-nvidia.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 302fa06..5f795ec 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -128,11 +128,6 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda Provides: cuda-drivers = %{version}.100 Provides: cuda-drivers%{?_isa} = %{version}.100 Obsoletes: cuda-drivers < %{version}.100 -# Comment out due to -#error: line 131: Illegal char ')' (0x29) in: Obsoletes: cuda-drivers(x86-64) < 440.82.100 -#error: line 131: Only package names are allowed in Obsoletes: Obsoletes: cuda-drivers(x86-64) < 440.82.100 -#error: query of specfile /home/leigh/development/fedora-git/xorg-x11-drv-nvidia/xorg-x11-drv-nvidia.spec failed, can't parse -#Obsoletes: cuda-drivers%{?_isa} < %{version}.100 Provides: nvidia-driver = %{version}-100 Provides: nvidia-driver%{?_isa} = %{version}-100 Provides: nvidia-drivers = %{version}-100 From dc7b3ced3809d8da2eee85e787cf2d0c09e99aed Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 20 Apr 2020 09:34:35 +0200 Subject: [PATCH 4/4] Fix rhel conditional for dracutopts --- xorg-x11-drv-nvidia.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 5f795ec..6670b62 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,10 +7,10 @@ %global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d %global _modprobe_d %{_prefix}/lib/modprobe.d/ %global _grubby %{_sbindir}/grubby --update-kernel=ALL -%if 0%{?rhel} -%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau nvidia-drm.modeset=1 -%else +%if 0%{?fedora} || 0%{?rhel} > 7 %global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1 +%else +%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau nvidia-drm.modeset=1 %endif %global debug_package %{nil}