From c2889945d2a367236f44b5fb242bbbd50b82da35 Mon Sep 17 00:00:00 2001
From: Jonathan Wright <jonathan@almalinux.org>
Date: Fri, 27 Feb 2026 09:31:41 -0600
Subject: [PATCH] Update mirror URLs/names to AlmaLinux-hosted CUDA repo Fix
 GPG key URL

---
 almalinux-nvidia.repo                | 20 ++++++++++----------
 almalinux-release-nvidia-driver.spec | 26 +++++++++-----------------
 nvidia-cuda.repo                     | 14 --------------
 3 files changed, 19 insertions(+), 41 deletions(-)
 delete mode 100644 nvidia-cuda.repo

diff --git a/almalinux-nvidia.repo b/almalinux-nvidia.repo
index d24dd26..c6b909a 100644
--- a/almalinux-nvidia.repo
+++ b/almalinux-nvidia.repo
@@ -1,31 +1,31 @@
 # NVIDIA driver repo for AlmaLinux
 
 [almalinux-nvidia]
-name=AlmaLinux Kitten $releasever - NVIDIA Driver
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nvidia
-# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/nvidia/$basearch/os/
+name=AlmaLinux Kitten $releasever - NVIDIA Driver & CUDA
+# mirrorlist=
+baseurl=https://nvidia.repo.almalinux.org/$releasever-kitten/$basearch/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-$releasever,https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch/$gpgkey
 metadata_expire=6h
 
 ## Sources
 [almalinux-nvidia-source]
 name=AlmaLinux Kitten $releasever - NVIDIA Driver Source
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nvidia-source
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/nvidia/Source/
+# mirrorlist=
+baseurl=https://vault.almalinux.org/almalinux-nvidia/$releasever-kitten/Source/
 gpgcheck=1
 enabled=0
-gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-$releasever
 metadata_expire=6h
 
 ## Debug
 [almalinux-nvidia-debuginfo]
 name=AlmaLinux Kitten $releasever - NVIDIA Driver debuginfo
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nvidia-debuginfo
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/nvidia/debug/$basearch/
+# mirrorlist=
+baseurl=https://vault.almalinux.org/almalinux-nvidia/$releasever-kitten/debug/$basearch/
 gpgcheck=1
 enabled=0
-gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-$releasever
 metadata_expire=6h
diff --git a/almalinux-release-nvidia-driver.spec b/almalinux-release-nvidia-driver.spec
index 238eb75..06d593b 100644
--- a/almalinux-release-nvidia-driver.spec
+++ b/almalinux-release-nvidia-driver.spec
@@ -1,12 +1,11 @@
 Name:		almalinux-release-nvidia-driver
 Summary:	AlmaLinux NVIDIA driver repository configuration
 Version:	%{?rhel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL-2.0-only
 URL:		https://almalinux.org/
-ExclusiveArch:  x86_64 %{x86_64} %{arm64}
+ExclusiveArch:  x86_64 %{arm64}
 Source0:	almalinux-nvidia.repo
-Source1:	nvidia-cuda.repo
 
 Requires:       epel-release
 Requires(post): epel-release
@@ -19,24 +18,12 @@ DNF configuration for AlmaLinux NVIDIA driver repository
 
 
 %prep
-%ifarch x86_64_v2
-sed -i "s/\$basearch/x86_64_v2/g" %{SOURCE0}
-sed -i '/^mirrorlist=/ s|$|?arch=x86_64_v2|g' %{SOURCE0}
-%endif
-%ifarch aarch64
-sed -i "s/\$basearch/sbsa/g" %{SOURCE1}
-%endif
-
-%if %{?rhel} == 9
-sed -i "s/\$gpgkey/D42D0685.pub/g" %{SOURCE1}
-%endif
 %if %{?rhel} == 10
-sed -i "s/\$gpgkey/CDF6BA43.pub/g" %{SOURCE1}
+sed -i "s/\$gpgkey/CDF6BA43.pub/g" %{SOURCE0}
 %endif
 
 %install
 install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 
 
 %post
@@ -47,10 +34,15 @@ fi
 
 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
-%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 
 
 %changelog
+* Thu Feb 26 2026 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-3
+- Update mirror URLs/names to AlmaLinux-hosted CUDA repo
+- Remove x86_64_v2 code/macros
+- Remove unused conditional block for EL9
+- Fix GPG key URL
+
 * Mon Aug 04 2025 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-2
 - Rebase to official NVIDIA CUDA repo
 
diff --git a/nvidia-cuda.repo b/nvidia-cuda.repo
deleted file mode 100644
index 11832f1..0000000
--- a/nvidia-cuda.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-# This repository is for NVIDIA user space and CUDA components which cannot be redistributed due to licensing restrictions.
-# This content is served directly by NVIDIA.
-
-# Do not modify this file, it will be overwritten/replaced on updates.
-
-[cuda-rhel$releasever-$basearch]
-name=cuda-rhel$releasever-$basearch
-baseurl=https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch/$gpgkey
-
-exclude=akmod-nvidia dkms-nvidia kmod-nvidia-*-dkms nvidia-fs* nvidia-gds* cuda-drivers
-- 
2.47.3