Use local GPG key path instead of URL, Update URL of CUDA repo

Fix GPG key URL

CDF6BA43.pub

@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGh5i9sBEADauODwoSqJfuUpu+n84QOIQILlI0j0s3sek78guxHpcu1h8tSv
+OSHMGNpdaOOGFiNXVIeMe3To44RNOGOeMYwclKvZuXMcYJkeWFp/sUkO4IJ0wgW+
+OA2Ia4x2X3lWyeXavQVBwo/IXqa0fbUVQHrz44S7mGb93PX2dXPZN8qnLZWcJSGk
+FIDi4yGlfSK9lfAbDK1nuXeQYFxfuNTLp1q5KesYwcAIbDyFZRFqgiXujsHrdRgA
+jXQ6MZzhr/etOKfvbbaMrsGfFUB6p1DPGdBEGkDTXrzQZPPbhRtH32bjz8VvqBU+
+cy8zYLdEpjy9ASO4iUevnnbArQ19L3yRulYVevdE3BzWL/EkPA9MojUbwZjWufs1
+z4nKydkiyK8ElHMncXX7PM3Qs4yWjnj1Muy9lD5FqAhJS8eRFFqVitNoRss7RUop
+mZhaaUlp6pc2Sv3bZfIAyDxylNUx9lbFOvCNpo5bhOj9xZQ+m2UEOpa3AWy9VBnl
+aYu6/UvM4CoaVBRBGnt/2OiVnuQ6EtSyQESN4ISjyYlu9i34EE9Qqkoj8pCUduG/
+3RMm1JTpbK6AE72IMTWcHrnR5XiJwT/xkLtaf8bPQx7Jiz4fqAcNII5Fdg1EgMFh
+aR7wMUciOamH2DWmODT9oJt5LEpf4kkEyAukP6LOtsr0yYaz77sabMIQJwARAQAB
+tCZLaXRtYWtlciAoRUwgMTApIDxraXRtYWtlckBudmlkaWEuY29tPokCRQQTAQgA
+LxYhBDJ/xddqdtwgma73H3q8QkHN9rpDBQJoeYvbAhsvAgsJAhUKAhYCAh4FAheA
+AAoJEHq8QkHN9rpDIGoQAL7lOEKbTXtFrCzdh8foCiJyI5V5guN5b4MkBXyMKjL6
+XUftIXx8JiTUOz6267U2bnHo5kvfyuK68LBgQZFFfJEEy5dGLuUBRnCde7UGRNd5
+Dp7O9kRrGnd27JYXYZ2mho2RwwDP9ko36/tVZaW5ymLW+YdEDW/xS+8sARI5nLzD
+YqqdyOnoTRk4ig5LZFkXxe6LjhGWlUk24iV32MkdtxnFk9SlPIO5b87TnX5vrYWi
+GwjAlIFK1+7/uKq4WGHDpQMh/ejXLc/l1lFITVlirB50J0YxlxOS9mjQVHSS6hyZ
+qNSrYtPb6qDcC2J5IBECsjeUMmohi5pPxvWR+n/rznA+RibwfSv76niZqgp9A8nW
+gYTchCgOdQBfkGAxVgsz/xUs9TXyMe7UVM9vmWZtk93cOnoPOt0RSXS434gkqlya
+yP6wSgSYhU5Gf5oVdFybDpUxkf839TeakMjBviPxjNG86tIdKfysdcZ4Lp/trsch
+p4IYlLV93Jy63v8+ZnmGJrm46NBuwFDUOIrOAI6T7dk51e/z837905+tnfB/hg3Q
+QgVzv+MZVH18eIq18EqeY0tiur5tddRDIZMWnvNuMIPDciqSTd6Prz8mqo1veiHb
+RrpPkHYHBHJtcsvE0KTTmqAXAnTnkYjIOwQ/W4T7hjZhUUUJ0DS0uzLn0pUrJxv1
+=V9PE
+-----END PGP PUBLIC KEY BLOCK-----

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/cuda/$releasever-kitten/$basearch/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA-CUDA-$releasever
 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=file:///etc/pki/rpm-gpg/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=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
 metadata_expire=6h

almalinux-release-nvidia-driver.spec

@@ -1,34 +1,32 @@
 Name:		almalinux-release-nvidia-driver
 Summary:	AlmaLinux NVIDIA driver repository configuration
-Version:	10
-Release:	1%{?dist}
+Version:	%{?rhel}
+Release:	4%{?dist}
 License:	GPL-2.0-only
 URL:		https://almalinux.org/
-ExclusiveArch:  %{x86_64} %{arm64}
+ExclusiveArch:  x86_64 %{arm64}
 Source0:	almalinux-nvidia.repo
-Source1:	negativo-nvidia.repo
 
 Requires:       epel-release
 Requires(post): epel-release
 Provides:	almalinux-release-nvidia-driver = %{version}
 Conflicts:	epel-nvidia
 
+# nvidia rhel10 key. URL reflects x86_64 but it is used by all arches
+Source110:      https://developer.download.nvidia.com/compute/cuda/repos/rhel10/x86_64/CDF6BA43.pub
+
 
 %description
 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
 
 
 %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 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
+%if %{?rhel} == 10
+install -D -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA-CUDA-10
 %endif
 
 
@@ -40,11 +38,24 @@ fi
 
 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
-%ifnarch x86_64_v2
-%{_sysconfdir}/yum.repos.d/negativo-nvidia.repo
-%endif
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA-CUDA-%{?rhel}
 
 
 %changelog
-* Mon May 26 2025 Jonathan Wright <jonathan@almalinux.org> - 10-1
+* Wed Mar 11 2026 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-4
+- Add NVIDIA GPG key in package
+- Use local path to NVIDIA GPG key instead of URL
+- Explicitly set leading 0 in repo file permissions
+- Update URL of CUDA repo
+
+* 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
+
+* Mon May 26 2025 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-1
 - Initial release

negativo-nvidia.repo

@@ -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