From 29f6fab29e4e0aac29059d4789d9bfc0c299ef2e Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 13 Jan 2026 13:16:54 -0600 Subject: [PATCH] fix(nvidia): Attempt to override library deps that pull the wrong branch (#9141) * fix(nvidia): Attempt to override library deps that pull the wrong branch Signed-off-by: Gilver * More Signed-off-by: Gilver * This one doesn't need it? Signed-off-by: Gilver * 580 too Signed-off-by: Gilver * bump: Release Signed-off-by: Gilver * bump: Release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/nvidia-580/nvidia-driver/nvidia-driver-580.spec | 4 +++- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia-580/nvidia-driver/nvidia-driver-580.spec b/anda/system/nvidia-580/nvidia-driver/nvidia-driver-580.spec index 121d60f08d..2703abb8b3 100644 --- a/anda/system/nvidia-580/nvidia-driver/nvidia-driver-580.spec +++ b/anda/system/nvidia-580/nvidia-driver/nvidia-driver-580.spec @@ -12,7 +12,7 @@ Name: %{real_name}-580 Version: 580.126.09 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License @@ -84,6 +84,7 @@ Requires: (%{name}-libs(x86-32) = %{?epoch:%{epoch}:}%{version}-%{release} # dlopened Requires: libnvidia-gpucomp-580%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libnvidia-ml-580%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: nvidia-x11-drv-libs Conflicts: nvidia-x11-drv-470xx-libs @@ -98,6 +99,7 @@ Summary: Libraries for %{name}-cuda Provides: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release} Requires: libnvidia-ml-580 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %ifarch x86_64 aarch64 Requires: libnvidia-cfg-580 = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index 664cbb367e..8130f9d4ee 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -11,7 +11,7 @@ Name: nvidia-driver Version: 590.48.01 -Release: 3%?dist +Release: 4%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License @@ -77,6 +77,7 @@ Requires: vulkan-loader # dlopened: Requires: libnvidia-gpucomp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libnvidia-ml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: nvidia-x11-drv-libs Conflicts: nvidia-x11-drv-470xx-libs @@ -88,6 +89,7 @@ This package provides the shared libraries for %{name}. %package cuda-libs Summary: Libraries for %{name}-cuda +Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}