From 97200e3ff62c13e8f6c8b83ca8a6e7e562010bf4 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Tue, 10 May 2022 14:48:20 +0200
Subject: [PATCH] Update for 8.6 stable

---
 almalinux-ha.repo               |  4 ++--
 almalinux-nfv.repo              | 27 +++++++++++++++++++++
 almalinux-plus.repo             |  4 ++--
 almalinux-powertools.repo       |  4 ++--
 almalinux-release.spec          | 42 ++++++++++++++++++++-------------
 almalinux-resilientstorage.repo |  4 ++--
 almalinux-rt.repo               | 27 +++++++++++++++++++++
 almalinux.repo                  | 12 +++++-----
 8 files changed, 94 insertions(+), 30 deletions(-)
 create mode 100644 almalinux-nfv.repo
 create mode 100644 almalinux-rt.repo

diff --git a/almalinux-ha.repo b/almalinux-ha.repo
index 81c3cde..9c409a4 100644
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [ha-source]
 name=AlmaLinux $releasever - HighAvailability Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -22,7 +22,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [ha-debuginfo]
 name=AlmaLinux $releasever - HighAvailability debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo
new file mode 100644
index 0000000..66028ab
--- /dev/null
+++ b/almalinux-nfv.repo
@@ -0,0 +1,27 @@
+# almalinux-nfv.repo
+
+[nfv]
+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 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 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
diff --git a/almalinux-plus.repo b/almalinux-plus.repo
index 2a6e81f..1a99935 100644
--- a/almalinux-plus.repo
+++ b/almalinux-plus.repo
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [plus-source]
 name=AlmaLinux $releasever - Plus Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
-# baseurl=https://repo.almalinux.org/almalinux/$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
@@ -22,7 +22,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [plus-debuginfo]
 name=AlmaLinux $releasever - Plus debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-powertools.repo b/almalinux-powertools.repo
index be0ed92..26f76c8 100644
--- a/almalinux-powertools.repo
+++ b/almalinux-powertools.repo
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [powertools-source]
 name=AlmaLinux $releasever - PowerTools Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -22,7 +22,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [powertools-debuginfo]
 name=AlmaLinux $releasever - PowerTools debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-release.spec b/almalinux-release.spec
index 9eaba20..cc1ec39 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -1,16 +1,14 @@
 %define debug_package %{nil}
 %define product_family AlmaLinux
-%define variant_titlecase Server
-%define variant_lowercase server
-%define release_name Arctic Sphynx
+%define release_name Sky Tiger
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.5
+%define full_release_version 8.6
 %define dist_release_version 8
-%define upstream_rel_long 8.5-0.8
-%define upstream_rel 8.5
-%define almalinux_rel 4
+%define upstream_rel_long 8.6-0.1
+%define upstream_rel 8.6
+%define almalinux_rel 0.1
 %define dist .el%{dist_release_version}
 
 # The anaconda scripts in %%{_libexecdir} can create false requirements
@@ -51,6 +49,9 @@ 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
 
 %description
 %{product_family} release files
@@ -119,6 +120,12 @@ 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 %{SOURCE305} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
+%endif
+
 mkdir -p -m 755 %{buildroot}/etc/dnf/vars
 echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
 echo "%{contentdir}" >%{buildroot}/etc/dnf/vars/contentdir
@@ -169,9 +176,13 @@ rm -rf %{buildroot}
 /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 %config(noreplace) /etc/yum.repos.d/almalinux.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
-%config(noreplace) /etc/yum.repos.d/almalinux-plus.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
+%endif
 %config(noreplace) /etc/os-release
 %config /etc/system-release-cpe
 %config(noreplace) /etc/issue
@@ -185,16 +196,15 @@ rm -rf %{buildroot}
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
-* Mon Dec 13 2021 Jonathan Wright <jonathan@almalinux.org> - 8.5-4
-- Enable DNF countme
+* Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.1
+- 8.6 stable release
 
-* Fri Nov 12 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-3
-- Fix ResilientStorage repo
+* 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
 
-* Tue Nov 09 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-2
-- 8.5 stable release
-- Add ResilientStorage repo
-- Add Plus repo
+* Tue Dec 28 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-1.1
+- Add RS repo
 
 * Thu Oct 07 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-1
 - 8.5 beta release
diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo
index 68190f7..8fc75cf 100644
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [resilientstorage-source]
 name=AlmaLinux $releasever - ResilientStorage Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -22,7 +22,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [resilientstorage-debuginfo]
 name=AlmaLinux $releasever - ResilientStorage debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-rt.repo b/almalinux-rt.repo
new file mode 100644
index 0000000..c0118a9
--- /dev/null
+++ b/almalinux-rt.repo
@@ -0,0 +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/
+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/
+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/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux.repo b/almalinux.repo
index 0e4fa30..a7b5d7a 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -31,7 +31,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [baseos-source]
 name=AlmaLinux $releasever - BaseOS Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -39,7 +39,7 @@ 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/almalinux/$releasever/AppStream/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -47,7 +47,7 @@ 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/almalinux/$releasever/extras/Source/
+# baseurl=https://repo.almalinux.org/vault/$releasever/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -56,7 +56,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [baseos-debuginfo]
 name=AlmaLinux $releasever - BaseOS debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -64,7 +64,7 @@ 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/almalinux/$releasever/AppStream/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -72,7 +72,7 @@ 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/almalinux/$releasever/extras/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux