Move Source and Debuginfo repos to vault

almalinux-ha.repo

@@ -1,28 +1,27 @@
 # almalinux-ha.repo
 
 [ha]
-name=AlmaLinux $releasever - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
+name=AlmaLinux 8.6-beta - High Availability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/ha
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/HighAvailability/$basearch/os/
 enabled=0
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [ha-source]
-name=AlmaLinux $releasever - HighAvailability Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/
+name=AlmaLinux 8.6-beta - High Availability Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/ha-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [ha-debuginfo]
-name=AlmaLinux $releasever - HighAvailability debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
+name=AlmaLinux 8.6-beta - High Availability Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/ha-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-nfv.repo

@@ -1,27 +1,27 @@
 # almalinux-nfv.repo
 
 [nfv]
-name=AlmaLinux $releasever - Real Time for NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+name=AlmaLinux 8.6-beta - Real Time for NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/NFV/$basearch/os/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [nfv-source]
-name=AlmaLinux $releasever - Real Time for NFV Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/Source/
+name=AlmaLinux 8.6-beta - Real Time for NFV Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [nfv-debuginfo]
-name=AlmaLinux $releasever - Real Time for NFV Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+name=AlmaLinux 8.6-beta - Real Time for NFV Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-plus.repo

@@ -1,28 +0,0 @@
-# almalinux-plus.repo
-
-[plus]
-name=AlmaLinux $releasever - Plus
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/$basearch/os/
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Sources
-[plus-source]
-name=AlmaLinux $releasever - Plus Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/plus/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-## Debuginfo
-[plus-debuginfo]
-name=AlmaLinux $releasever - Plus debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-powertools.repo

@@ -1,28 +1,27 @@
 # almalinux-powertools.repo
 
 [powertools]
-name=AlmaLinux $releasever - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
+name=AlmaLinux 8.6-beta - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/powertools
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/PowerTools/$basearch/os/
 enabled=0
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [powertools-source]
-name=AlmaLinux $releasever - PowerTools Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/Source/
+name=AlmaLinux 8.6-beta - PowerTools Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/powertools-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/PowerTools/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [powertools-debuginfo]
-name=AlmaLinux $releasever - PowerTools debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/debug/$basearch/
+name=AlmaLinux 8.6-beta - PowerTools Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-release.spec

@@ -6,11 +6,13 @@
 %define base_release_version 8
 %define full_release_version 8.6
 %define dist_release_version 8
-%define upstream_rel_long 8.6-0.1
+%define upstream_rel_long 8.6-0.0
 %define upstream_rel 8.6
-%define almalinux_rel 1
+%define almalinux_rel 0.0
 %define dist .el%{dist_release_version}
 
+%define beta Beta
+
 # The anaconda scripts in %%{_libexecdir} can create false requirements
 %global __requires_exclude_from %{_libexecdir}
 
@@ -48,10 +50,10 @@ Source300:      almalinux.repo
 Source301:      almalinux-ha.repo
 Source302:      almalinux-powertools.repo
 Source303:      almalinux-resilientstorage.repo
-Source304:      almalinux-plus.repo
+
 # Only for x86_64
-Source305:      almalinux-rt.repo
-Source306:      almalinux-nfv.repo
+Source304:      almalinux-rt.repo
+Source305:      almalinux-nfv.repo
 
 %description
 %{product_family} release files
@@ -118,12 +120,11 @@ install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE301} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE303} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d
 
 # RT and NFV are only for x86_64
 %ifarch x86_64
+install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d
-install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
 %endif
 
 mkdir -p -m 755 %{buildroot}/etc/dnf/vars
@@ -178,7 +179,6 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-powertools.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-resilientstorage.repo
-%config(noreplace) /etc/yum.repos.d/almalinux-plus.repo
 %ifarch x86_64
 %config(noreplace) /etc/yum.repos.d/almalinux-rt.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-nfv.repo
@@ -196,12 +196,6 @@ rm -rf %{buildroot}
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
-* Thu May 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-1
-- Bump release
-
-* Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.1
-- 8.6 stable release
-
 * Thu Mar 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.0
 - 8.6 beta release
 - Add RT and NFV repos for x86_64

almalinux-resilientstorage.repo

@@ -1,28 +1,27 @@
 # almalinux-resilientstorage.repo
 
 [resilientstorage]
-name=AlmaLinux $releasever - ResilientStorage
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
+name=AlmaLinux 8.6-beta - Resilient Storage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/resilientstorage
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/ResilientStorage/$basearch/os/
 enabled=0
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [resilientstorage-source]
-name=AlmaLinux $releasever - ResilientStorage Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/Source/
+name=AlmaLinux 8.6-beta - Resilient Storage Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/resilientstorage-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [resilientstorage-debuginfo]
-name=AlmaLinux $releasever - ResilientStorage debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
+name=AlmaLinux 8.6-beta - Resilient Storage Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/resilientstorage-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/ResilientStorage/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-rt.repo

@@ -1,27 +1,27 @@
 # almalinux-rt.repo
 
 [rt]
-name=AlmaLinux $releasever - Real Time
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/
+name=AlmaLinux 8.6-beta - Real Time
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/rt
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/RT/$basearch/os/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [rt-source]
-name=AlmaLinux $releasever - Real Time Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/RT/Source/
+name=AlmaLinux 8.6-beta - Real Time Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/rt-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/RT/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [rt-debuginfo]
-name=AlmaLinux $releasever - Real Time Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/
+name=AlmaLinux 8.6-beta - Real Time Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/rt-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux.repo

@@ -1,78 +1,75 @@
 # almalinux.repo
 
 [baseos]
-name=AlmaLinux $releasever - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
+name=AlmaLinux 8.6-beta - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/baseos
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream]
-name=AlmaLinux $releasever - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
+name=AlmaLinux 8.6-beta - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/appstream
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras]
-name=AlmaLinux $releasever - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
+name=AlmaLinux 8.6-beta - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/extras
+# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/extras/$basearch/os/
 enabled=1
 gpgcheck=1
-countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [baseos-source]
-name=AlmaLinux $releasever - BaseOS Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/Source/
+name=AlmaLinux 8.6-beta - BaseOS Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/baseos-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream-source]
-name=AlmaLinux $releasever - AppStream Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/Source/
+name=AlmaLinux 8.6-beta - AppStream Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/appstream-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras-source]
-name=AlmaLinux $releasever - Extras Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
-# baseurl=https://repo.almalinux.org/vault/$releasever/extras/Source/
+name=AlmaLinux 8.6-beta - Extras Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/extras-source
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [baseos-debuginfo]
-name=AlmaLinux $releasever - BaseOS debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
+name=AlmaLinux 8.6-beta - BaseOS Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream-debuginfo]
-name=AlmaLinux $releasever - AppStream debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
+name=AlmaLinux 8.6-beta - AppStream Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras-debuginfo]
-name=AlmaLinux $releasever - Extras debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
-# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
+name=AlmaLinux 8.6-beta - Extras Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/extras-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux