From 515077ef5ebb35d06fa3f3fdbb1bbe309ff1e904 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 14 Jul 2024 09:43:46 -0700
Subject: [PATCH] fix repo files

---
 SOURCES/rocky-addons.repo | 36 ++++++++++++++++++------------------
 SOURCES/rocky-devel.repo  |  6 +++---
 SOURCES/rocky-extras.repo | 12 ++++++------
 SOURCES/rocky.repo        | 18 +++++++++---------
 SPECS/rocky-release.spec  |  5 ++++-
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/SOURCES/rocky-addons.repo b/SOURCES/rocky-addons.repo
index b5bfba9..7d35001 100644
--- a/SOURCES/rocky-addons.repo
+++ b/SOURCES/rocky-addons.repo
@@ -16,7 +16,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [highavailability-debuginfo]
 name=Rocky Linux $releasever - High Availability - Debug
@@ -25,7 +25,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basea
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [highavailability-source]
 name=Rocky Linux $releasever - High Availability - Source
@@ -34,7 +34,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [resilientstorage]
 name=Rocky Linux $releasever - Resilient Storage
@@ -44,7 +44,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [resilientstorage-debuginfo]
 name=Rocky Linux $releasever - Resilient Storage - Debug
@@ -53,7 +53,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basea
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [resilientstorage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -62,7 +62,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [nfv]
 name=Rocky Linux $releasever - NFV
@@ -72,7 +72,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [nfv-debuginfo]
 name=Rocky Linux $releasever - NFV Debug
@@ -81,7 +81,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/debug/tre
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [nfv-source]
 name=Rocky Linux $releasever - NFV Source
@@ -90,7 +90,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [rt]
 name=Rocky Linux $releasever - Realtime
@@ -100,7 +100,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [rt-debuginfo]
 name=Rocky Linux $releasever - Realtime Debug
@@ -109,7 +109,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [rt-source]
 name=Rocky Linux $releasever - Realtime Source
@@ -118,7 +118,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [sap]
 name=Rocky Linux $releasever - SAP
@@ -128,7 +128,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [sap-debuginfo]
 name=Rocky Linux $releasever - SAP Debug
@@ -137,7 +137,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/debug/tre
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [sap-source]
 name=Rocky Linux $releasever - SAP Source
@@ -146,7 +146,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [saphana]
 name=Rocky Linux $releasever - SAPHANA
@@ -156,7 +156,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [saphana-debuginfo]
 name=Rocky Linux $releasever - SAPHANA Debug
@@ -165,7 +165,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/debug
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [saphana-source]
 name=Rocky Linux $releasever - SAPHANA Source
@@ -174,4 +174,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
diff --git a/SOURCES/rocky-devel.repo b/SOURCES/rocky-devel.repo
index a2aebd7..6f9de09 100644
--- a/SOURCES/rocky-devel.repo
+++ b/SOURCES/rocky-devel.repo
@@ -9,7 +9,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [devel-debuginfo]
 name=Rocky Linux $releasever - Devel Debug WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
@@ -18,7 +18,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/debug/t
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [devel-source]
 name=Rocky Linux $releasever - Devel Source WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
@@ -27,4 +27,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/source/tree/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
diff --git a/SOURCES/rocky-extras.repo b/SOURCES/rocky-extras.repo
index 446e9d0..4040280 100644
--- a/SOURCES/rocky-extras.repo
+++ b/SOURCES/rocky-extras.repo
@@ -16,7 +16,7 @@ gpgcheck=1
 enabled=1
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [extras-debuginfo]
 name=Rocky Linux $releasever - Extras Debug
@@ -25,7 +25,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [extras-source]
 name=Rocky Linux $releasever - Extras Source
@@ -34,7 +34,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [plus]
 name=Rocky Linux $releasever - Plus
@@ -44,7 +44,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [plus-debuginfo]
 name=Rocky Linux $releasever - Plus - Debug
@@ -53,7 +53,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tr
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
@@ -62,4 +62,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
diff --git a/SOURCES/rocky.repo b/SOURCES/rocky.repo
index ca56097..bd10543 100644
--- a/SOURCES/rocky.repo
+++ b/SOURCES/rocky.repo
@@ -16,7 +16,7 @@ gpgcheck=1
 enabled=1
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [baseos-debuginfo]
 name=Rocky Linux $releasever - BaseOS - Debug
@@ -25,7 +25,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
@@ -34,7 +34,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
@@ -44,7 +44,7 @@ gpgcheck=1
 enabled=1
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [appstream-debuginfo]
 name=Rocky Linux $releasever - AppStream - Debug
@@ -53,7 +53,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/deb
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
@@ -62,7 +62,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [crb]
 name=Rocky Linux $releasever - CRB
@@ -72,7 +72,7 @@ gpgcheck=1
 enabled=0
 countme=1
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [crb-debuginfo]
 name=Rocky Linux $releasever - CRB - Debug
@@ -81,7 +81,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tre
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
 
 [crb-source]
 name=Rocky Linux $releasever - CRB - Source
@@ -90,4 +90,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 91b1e2e..8bcb326 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -21,7 +21,7 @@
 %define distro_code  Red Quartz
 %define major        10
 %define minor        0
-%define rocky_rel    0%{?rllh:.%{rllh}}%{!?rllh:.14}
+%define rocky_rel    0%{?rllh:.%{rllh}}%{!?rllh:.15}
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 %define home_url     https://rockylinux.org/
@@ -482,6 +482,9 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %{_datadir}/pki/sb-certs/*
 
 %changelog
+* Sun Jul 14 2024 Louis Abel <label@resf.org> - 10.0-0.15
+- Fix repo files
+
 * Thu Jul 11 2024 Louis Abel <label@rockylinux.org> - 10.0-0.14
 - Update man page