From 501db2e1cca7befba7309f554cb1495dbf0f6a25 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 6 Mar 2026 13:12:53 -0800 Subject: [PATCH] add: terra-mock-gpg-keys (#10339) (#10340) (cherry picked from commit 6e45f7f84679b7fbe952d65260d5412c79f4b64d) Co-authored-by: Gilver --- anda/terra/RPM-GPG-KEY-terra44-source | 17 ----------------- anda/terra/gpg-keys/terra-gpg-keys.spec | 13 +++++++++++++ anda/terra/mock-configs/terra-mock-configs.spec | 3 ++- 3 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 anda/terra/RPM-GPG-KEY-terra44-source diff --git a/anda/terra/RPM-GPG-KEY-terra44-source b/anda/terra/RPM-GPG-KEY-terra44-source deleted file mode 100644 index ea6e6659ab..0000000000 --- a/anda/terra/RPM-GPG-KEY-terra44-source +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GopenPGP 2.8.1 -Comment: https://gopenpgp.org - -xjMEaYpzWxYJKwYBBAHaRw8BAQdA7UMAtNQ1lu/zeq7f6ak1ZRDb09GI5nKRTGPb -z5/P9DLNKVRlcnJhIDQ0IC0gU291cmNlIDxzZWN1cml0eUBmeXJhbGFicy5jb20+ -wr8EExYIAHEFgmmKc1sDCwkHCZD5EsiV2QOikTUUAAAAAAAcABBzYWx0QG5vdGF0 -aW9ucy5vcGVucGdwanMub3JnKnNq119JCv79xo34cTtU+AIVCAMWAAICGQECmwMC -HgEWIQSo/fET0Zg0/vaHhXf5EsiV2QOikQAAZvIBAOBgURJ0bpsl9UQt+oty/9g6 -QJwE7x2KvTfw9CIjzd2yAQCqE6mBtL4Wd0T8FFXzg2KYgMPvNlkof24kas5Y79ID -DM44BGmKc1sSCisGAQQBl1UBBQEBB0C1EBr2yVcLBryHfBsJ8HffYUYmQxdOytvC -4sEKnn+UcAMBCgnCrgQYFggAYAWCaYpzWwmQ+RLIldkDopE1FAAAAAAAHAAQc2Fs -dEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ7hCyKk6CNKWKKt60jpyuYACmwwWIQSo -/fET0Zg0/vaHhXf5EsiV2QOikQAAKLABAJSkznaUgXt2HisPv9rJGBjobx3dx9Ns -SZs4qLEwaBzAAQCGD5cZBVo4sVzskOhFAG3U2wMMGyTXP4+hvsFB09HNCg== -=F2xn ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/anda/terra/gpg-keys/terra-gpg-keys.spec b/anda/terra/gpg-keys/terra-gpg-keys.spec index fc80a23efc..17db0aa5e1 100644 --- a/anda/terra/gpg-keys/terra-gpg-keys.spec +++ b/anda/terra/gpg-keys/terra-gpg-keys.spec @@ -58,6 +58,12 @@ Packager: Terra Packaging Team %description GPG keys for Terra, used for verifying RPM package signatures. +%package -n terra-mock-gpg-keys +Summary: Terra GPG keys for Mock + +%description -n terra-mock-gpg-keys +Terra GPG key copies for use in Mock. + %prep %build @@ -66,6 +72,13 @@ GPG keys for Terra, used for verifying RPM package signatures. install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ +install -d -m 755 $RPM_BUILD_ROOT/etc/pki/mock +install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/mock/ + %files %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-* + +%files -n terra-mock-gpg-keys +%dir /etc/pki/mock +/etc/pki/mock/RPM-GPG-KEY-* diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index bfd8692339..a6d33a8e5f 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,6 +1,6 @@ Name: terra-mock-configs Version: 2.2.4 -Release: 2%?dist +Release: 3%?dist Epoch: 1 Summary: Mock configs for Terra repos @@ -10,6 +10,7 @@ Source0: %url/archive/refs/tags/v%version.tar.gz BuildRequires: mock-core-configs Requires: mock-core-configs +Requires: terra-mock-gpg-keys BuildArch: noarch Provides: anda-mock-configs = %{epoch}:%{version}-%{release}