From 2c1f46f59af0d9eff3b4310e304733605342beef Mon Sep 17 00:00:00 2001
From: Jonathan Wright <jonathan@almalinux.org>
Date: Mon, 4 Aug 2025 16:21:55 -0500
Subject: [PATCH] Rebase to official NVIDIA CUDA repo

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

diff --git a/almalinux-release-nvidia-driver.spec b/almalinux-release-nvidia-driver.spec
index 79ed4a1..a29a381 100644
--- a/almalinux-release-nvidia-driver.spec
+++ b/almalinux-release-nvidia-driver.spec
@@ -1,12 +1,12 @@
 Name:		almalinux-release-nvidia-driver
 Summary:	AlmaLinux NVIDIA driver repository configuration
 Version:	10
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL-2.0-only
 URL:		https://almalinux.org/
 ExclusiveArch:  %{x86_64} %{arm64}
 Source0:	almalinux-nvidia.repo
-Source1:	negativo-nvidia.repo
+Source1:	nvidia-cuda.repo
 
 Requires:       epel-release
 Requires(post): epel-release
@@ -23,12 +23,21 @@ DNF configuration for AlmaLinux NVIDIA driver repository
 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}
+%endif
 
 %install
 install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
 %ifnarch x86_64_v2
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/negativo-nvidia.repo
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 %endif
 
 
@@ -41,10 +50,13 @@ fi
 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
 %ifnarch x86_64_v2
-%{_sysconfdir}/yum.repos.d/negativo-nvidia.repo
+%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 %endif
 
 
 %changelog
+* Mon Aug 04 2025 Jonathan Wright <jonathan@almalinux.org> - 10-2
+- Rebase to official NVIDIA CUDA repo
+
 * Mon May 26 2025 Jonathan Wright <jonathan@almalinux.org> - 10-1
 - Initial release
diff --git a/negativo-nvidia.repo b/negativo-nvidia.repo
deleted file mode 100644
index cde09ff..0000000
--- a/negativo-nvidia.repo
+++ /dev/null
@@ -1,41 +0,0 @@
-# This repository is for NVIDIA user space and CUDA components which cannot be redistributed due to licensing restrictions.
-# This repo's content represents what will become the official NVIDIA repository for these components.
-# We will swap this to the official NVIDIA repository when it becomes available on the NVIDIA domain.
-# Do not modify this file, it will be overwritten/replaced on updates.
-
-[negativo-nvidia]
-name=AlmaLinux Kitten $releasever - negativo17 - NVIDIA
-baseurl=https://negativo17.org/repos/nvidia/epel-$releasever/$basearch/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0
-exclude=akmod-nvidia dkms-nvidia nvidia-driver nvidia-driver-libs nvidia-settings
-
-[negativo-nvidia-source]
-name=AlmaLinux Kitten $releasever - negativo17 - NVIDIA - Source
-baseurl=https://negativo17.org/repos/nvidia/epel-$releasever/SRPMS
-enabled=0
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0
-
-[negativo-nvidia-debug]
-name=AlmaLinux Kitten $releasever - negativo17 - NVIDIA - Debug
-baseurl=https://negativo17.org/repos/nvidia/epel-$releasever/$basearch.debug/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=1
-gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
-enabled_metadata=1
-metadata_expire=6h
-type=rpm-md
-repo_gpgcheck=0
diff --git a/nvidia-cuda.repo b/nvidia-cuda.repo
new file mode 100644
index 0000000..11832f1
--- /dev/null
+++ b/nvidia-cuda.repo
@@ -0,0 +1,14 @@
+# 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