From 50b5cc08ccb7390e3726a9019c6629de7ed8fcfd Mon Sep 17 00:00:00 2001
From: lea <lleyton@fyralabs.com>
Date: Sat, 6 Dec 2025 20:14:28 -0800
Subject: [PATCH] feat(terra-release): use local gpg keys (#8131) (#8138)

(cherry picked from commit 9d2cd161fd652ebf5595aff78cfd0f7cca5bfc8b)

# Conflicts:
#	anda/terra/release/terra-extras.repo
#	anda/terra/release/terra-mesa.repo
#	anda/terra/release/terra-multimedia.repo
#	anda/terra/release/terra-nvidia.repo
#	anda/terra/release/terra-release.spec
#	anda/terra/release/terra.repo
---
 anda/terra/release/terra-release.spec | 4 +++-
 anda/terra/release/terra.repo         | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec
index 893dafaaef..929c49e628 100644
--- a/anda/terra/release/terra-release.spec
+++ b/anda/terra/release/terra-release.spec
@@ -2,7 +2,7 @@
 
 Name:           terra-release
 Version:        %{?fedora:%{fedora}}%{?rhel:%{rhel}}
-Release:        6
+Release:        7
 Summary:        Release package for Terra
 
 License:        MIT
@@ -14,6 +14,8 @@ BuildArch:      noarch
 %dnl Requires:       system-release(%{version})
 Requires:       (epel-release-latest-%{version} or epel-release)
 
+Requires:       terra-gpg-keys
+
 %description
 Release package for Terra, containing the Terra repository configuration.
 
diff --git a/anda/terra/release/terra.repo b/anda/terra/release/terra.repo
index c89a4c05b5..d6bfa15fc0 100644
--- a/anda/terra/release/terra.repo
+++ b/anda/terra/release/terra.repo
@@ -5,7 +5,7 @@ metalink=https://tetsudou.fyralabs.com/metalink?repo=terrael$releasever&arch=$ba
 metadata_expire=6h
 type=rpm
 gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terrael$releasever/key.asc
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-terrael$releasever
 repo_gpgcheck=1
 enabled=1
 enabled_metadata=1
@@ -19,7 +19,7 @@ metalink=https://tetsudou.fyralabs.com/metalink?repo=terrael$releasever-source&a
 metadata_expire=6h
 type=rpm
 gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terrael$releasever-source/key.asc
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-terrael$releasever-source
 repo_gpgcheck=1
 enabled=0
 enabled_metadata=0