Merge branch 'a8' into a8-rhel

- Bump Epoch

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.7-beta - High Availability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - High Availability Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - High Availability Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-beta/HighAvailability/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.7-beta - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - PowerTools Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - PowerTools Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-beta/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

almalinux-release.spec

@@ -11,12 +11,15 @@
 %define almalinux_rel 1
 %define dist .el%{dist_release_version}
 
+%define beta Beta
+
 # The anaconda scripts in %%{_libexecdir} can create false requirements
 %global __requires_exclude_from %{_libexecdir}
 
 Name:           almalinux-release
+Epoch:          2
 Version:        %{upstream_rel}
-Release:        %{almalinux_rel}%{?dist}
+Release:        %{almalinux_rel}%{?dist}.1
 Summary:        %{product_family} release file
 Group:          System Environment/Base
 License:        GPLv2
@@ -83,8 +86,8 @@ ln -s almalinux-release %{buildroot}/etc/centos-release
 cat << EOF >>%{buildroot}%{_prefix}/lib/os-release
 NAME="%{product_family}"
 VERSION="%{full_release_version} (%{release_name})"
-ID="almalinux"
-ID_LIKE="rhel centos fedora"
+ID="rhel"
+ID_LIKE="fedora"
 VERSION_ID="%{full_release_version}"
 PLATFORM_ID="platform:el%{base_release_version}"
 PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{release_name})"

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.7-beta - Resilient Storage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - Resilient Storage Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - Resilient Storage Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - Real Time
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - Real Time Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - Real Time Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras
+# baseurl=https://repo.almalinux.org/almalinux/8.7-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.7-beta - BaseOS Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - AppStream Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - Extras Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-source
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - BaseOS Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - AppStream Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-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.7-beta - Extras Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.7-beta/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux