elrepo-release: update for el8 and el9

Signed-off-by: Akemi Yagi <[email protected]>
elrepo · Jan 12, 2025 · 022bfbd · 022bfbd
1 parent 308b323
commit 022bfbd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/elrepo-release/el8/elrepo-release.spec b/elrepo-release/el8/elrepo-release.spec
@@ -4,7 +4,7 @@
 Summary: ELRepo.org Community Enterprise Linux Repository release file
 Name: elrepo-release
 Version: 8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: https://elrepo.org/
@@ -53,6 +53,9 @@ This package contains yum configuration for the ELRepo.org Community Enterprise
 %{_sysconfdir}/pki/elrepo/SECURE-BOOT-KEY-elrepo.org.der
 
 %changelog
+* Sat Jan 11 2025 Philip J Perry <[email protected]> - 8.4-2
+- Fix elrepo.repo file for multiple gpg keys
+
 * Fri Jan 10 2025 Philip J Perry <[email protected]> - 8.4-1
 - Add new v2 (4096-bit) RPM signing key
 

diff --git a/elrepo-release/el8/elrepo.repo b/elrepo-release/el8/elrepo.repo
@@ -11,7 +11,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo.el8
 enabled=1
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-testing]
 name=ELRepo.org Community Enterprise Linux Testing Repository - el8
@@ -23,7 +23,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-testing.el8
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-kernel]
 name=ELRepo.org Community Enterprise Linux Kernel Repository - el8
@@ -35,7 +35,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-kernel.el8
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-extras]
 name=ELRepo.org Community Enterprise Linux Extras Repository - el8
@@ -47,4 +47,4 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-extras.el8
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
diff --git a/elrepo-release/el9/elrepo-release.spec b/elrepo-release/el9/elrepo-release.spec
@@ -4,7 +4,7 @@
 Summary: ELRepo.org Community Enterprise Linux Repository release file
 Name: elrepo-release
 Version: 9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: https://elrepo.org/
@@ -51,6 +51,9 @@ This package contains yum configuration for the ELRepo.org Community Enterprise
 %{_sysconfdir}/pki/elrepo/SECURE-BOOT-KEY-elrepo.org.der
 
 %changelog
+* Sat Jan 11 2025 Philip J Perry <[email protected]> - 9.5-2
+- Fix elrepo.repo file for multiple gpg keys
+
 * Fri Jan 10 2025 Philip J Perry <[email protected]> - 9.5-1
 - Add new v2 (4096-bit) RPM signing key
 

diff --git a/elrepo-release/el9/elrepo.repo b/elrepo-release/el9/elrepo.repo
@@ -11,7 +11,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo.el9
 enabled=1
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-testing]
 name=ELRepo.org Community Enterprise Linux Testing Repository - el9
@@ -23,7 +23,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-testing.el9
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-kernel]
 name=ELRepo.org Community Enterprise Linux Kernel Repository - el9
@@ -35,7 +35,7 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-kernel.el9
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org
 
 [elrepo-extras]
 name=ELRepo.org Community Enterprise Linux Extras Repository - el9
@@ -47,4 +47,4 @@ mirrorlist=http://mirrors.elrepo.org/mirrors-elrepo-extras.el9
 enabled=0
 countme=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org file:///etc/pki/rpm-gpg/RPM-GPG-KEY-v2-elrepo.org