From f9048572112709465db2cc7b16e6a2987150369c Mon Sep 17 00:00:00 2001
From: Louis Abel <tucklesepk@gmail.com>
Date: Fri, 1 Jul 2022 11:33:27 -0700
Subject: [PATCH] rltype will be a value for repo

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

diff --git a/SOURCES/rocky-addons.repo b/SOURCES/rocky-addons.repo
index db08fd7..2aabae5 100644
--- a/SOURCES/rocky-addons.repo
+++ b/SOURCES/rocky-addons.repo
@@ -10,7 +10,7 @@
 
 [highavailability]
 name=Rocky Linux $releasever - High Availability
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -20,7 +20,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-debug]
 name=Rocky Linux $releasever - High Availability - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -29,7 +29,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-source]
 name=Rocky Linux $releasever - High Availability - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
 gpgcheck=1
 enabled=0
@@ -38,7 +38,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage]
 name=Rocky Linux $releasever - Resilient Storage
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -48,7 +48,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -57,7 +57,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
 gpgcheck=1
 enabled=0
@@ -66,7 +66,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv]
 name=Rocky Linux $releasever - NFV
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -76,7 +76,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv-debug]
 name=Rocky Linux $releasever - NFV Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -85,7 +85,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv-source]
 name=Rocky Linux $releasever - NFV Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/source/tree/
 gpgcheck=1
 enabled=0
@@ -94,7 +94,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt]
 name=Rocky Linux $releasever - Realtime
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -104,7 +104,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-debug]
 name=Rocky Linux $releasever - Realtime Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -113,7 +113,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-source]
 name=Rocky Linux $releasever - Realtime Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
 gpgcheck=1
 enabled=0
@@ -122,7 +122,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap]
 name=Rocky Linux $releasever - SAP
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -132,7 +132,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap-debug]
 name=Rocky Linux $releasever - SAP Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -141,7 +141,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap-source]
 name=Rocky Linux $releasever - SAP Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/source/tree/
 gpgcheck=1
 enabled=0
@@ -150,7 +150,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana]
 name=Rocky Linux $releasever - SAPHANA
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -160,7 +160,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana-debug]
 name=Rocky Linux $releasever - SAPHANA Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -169,7 +169,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana-source]
 name=Rocky Linux $releasever - SAPHANA Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/source/tree/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/rocky-devel.repo b/SOURCES/rocky-devel.repo
index 9cc24aa..c577a44 100644
--- a/SOURCES/rocky-devel.repo
+++ b/SOURCES/rocky-devel.repo
@@ -4,7 +4,7 @@
 
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/rocky-extras.repo b/SOURCES/rocky-extras.repo
index a8590c3..25b31ee 100644
--- a/SOURCES/rocky-extras.repo
+++ b/SOURCES/rocky-extras.repo
@@ -10,7 +10,7 @@
 
 [extras]
 name=Rocky Linux $releasever - Extras
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
@@ -20,7 +20,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-debug]
 name=Rocky Linux $releasever - Extras Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -29,7 +29,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-source]
 name=Rocky Linux $releasever - Extras Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
 gpgcheck=1
 enabled=0
@@ -38,7 +38,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus]
 name=Rocky Linux $releasever - Plus
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -48,7 +48,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-debug]
 name=Rocky Linux $releasever - Plus - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -57,7 +57,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=rockyplus-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=rockyplus-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/rocky.repo b/SOURCES/rocky.repo
index 342cabb..fb24cfb 100644
--- a/SOURCES/rocky.repo
+++ b/SOURCES/rocky.repo
@@ -10,7 +10,7 @@
 
 [baseos]
 name=Rocky Linux $releasever - BaseOS
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
@@ -20,7 +20,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-debug]
 name=Rocky Linux $releasever - BaseOS - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -29,7 +29,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
@@ -38,7 +38,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
@@ -48,7 +48,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -57,7 +57,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
@@ -66,7 +66,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb]
 name=Rocky Linux $releasever - CRB
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
 gpgcheck=1
 enabled=0
@@ -76,7 +76,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-debug]
 name=Rocky Linux $releasever - CRB - Debug
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
@@ -85,7 +85,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-source]
 name=Rocky Linux $releasever - CRB - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source&rltype=$rltype
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source$rltype
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
 gpgcheck=1
 enabled=0
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 1f6cdbb..1a88b98 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -26,7 +26,7 @@
 
 %define contentdir   pub/rocky
 %define sigcontent   pub/sig
-%define rltype       stable
+%define rltype       %{nil}
 %define rlosid       rocky
 
 %define os_bug_name  Rocky-Linux-%{major}
@@ -418,6 +418,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 %changelog
 * Thu Jun 30 2022 Louis Abel <label@rockylinux.org> - 9.0-2.1
 - Prepare for release
+- Ensure rltype is blank for stable releases
 
 * Wed Jun 22 2022 Louis Abel <label@rockylinux.org> - 9.0-1.22
 - Change to using mirrorlist