From 325d40febb017d05c9be8d49d885c33fd715c053 Mon Sep 17 00:00:00 2001
From: Jonathan Wright <jonathan@almalinux.org>
Date: Wed, 11 Mar 2026 16:06:53 -0500
Subject: [PATCH] Use local GPG key path instead of URL, Update URL of CUDA
 repo

---
 CDF6BA43.pub                         | 28 ++++++++++++++++++++++++++++
 almalinux-nvidia.repo                |  8 ++++----
 almalinux-release-nvidia-driver.spec | 21 ++++++++++++++++-----
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 CDF6BA43.pub

diff --git a/CDF6BA43.pub b/CDF6BA43.pub
new file mode 100644
index 0000000..4b7deb5
--- /dev/null
+++ b/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-----
diff --git a/almalinux-nvidia.repo b/almalinux-nvidia.repo
index c6b909a..deec228 100644
--- a/almalinux-nvidia.repo
+++ b/almalinux-nvidia.repo
@@ -3,11 +3,11 @@
 [almalinux-nvidia]
 name=AlmaLinux Kitten $releasever - NVIDIA Driver & CUDA
 # mirrorlist=
-baseurl=https://nvidia.repo.almalinux.org/$releasever-kitten/$basearch/
+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-$releasever,https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch/$gpgkey
+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
@@ -17,7 +17,7 @@ name=AlmaLinux Kitten $releasever - NVIDIA Driver Source
 baseurl=https://vault.almalinux.org/almalinux-nvidia/$releasever-kitten/Source/
 gpgcheck=1
 enabled=0
-gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
 metadata_expire=6h
 
 ## Debug
@@ -27,5 +27,5 @@ name=AlmaLinux Kitten $releasever - NVIDIA Driver debuginfo
 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-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
 metadata_expire=6h
diff --git a/almalinux-release-nvidia-driver.spec b/almalinux-release-nvidia-driver.spec
index 06d593b..6f48a93 100644
--- a/almalinux-release-nvidia-driver.spec
+++ b/almalinux-release-nvidia-driver.spec
@@ -1,7 +1,7 @@
 Name:		almalinux-release-nvidia-driver
 Summary:	AlmaLinux NVIDIA driver repository configuration
 Version:	%{?rhel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL-2.0-only
 URL:		https://almalinux.org/
 ExclusiveArch:  x86_64 %{arm64}
@@ -12,18 +12,22 @@ 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
-%if %{?rhel} == 10
-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 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
 
 
 %post
@@ -34,9 +38,16 @@ fi
 
 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA-CUDA-%{?rhel}
 
 
 %changelog
+* 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
-- 
2.47.3