From 131f72d3a4bed8370a64c82d14e7c3c1edb5fa3d Mon Sep 17 00:00:00 2001
From: Andrei Lukoshko <alukoshko@cloudlinux.com>
Date: Thu, 20 May 2021 21:31:32 +0300
Subject: [PATCH] Update to 8.4 stable

---
 90-default.preset      |  3 ++
 almalinux-ha.repo      | 18 +++++------
 almalinux-release.spec |  7 ++--
 almalinux.repo         | 72 +++++++++++++++++++++---------------------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/90-default.preset b/90-default.preset
index 3c38515..318d705 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -158,6 +158,9 @@ enable device_cio_free.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1632510
 enable stratisd.service
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1817591
+enable mlocate-updatedb.timer
+
 # nvme auto connect
 # https://bugzilla.redhat.com/show_bug.cgi?id=1805466
 enable nvmefc-boot-connections.service
diff --git a/almalinux-ha.repo b/almalinux-ha.repo
index 6ff5fcc..f89c70c 100644
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@@ -1,9 +1,9 @@
 # almalinux-ha.repo
 
 [ha]
-name=AlmaLinux 8.4-beta - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/$basearch/os/
+name=AlmaLinux $releasever - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -11,9 +11,9 @@ fastestmirror=1
 
 ## Sources
 [ha-source]
-name=AlmaLinux 8.4-beta - HighAvailability Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha-source
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/Source/
+name=AlmaLinux $releasever - HighAvailability Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,9 +21,9 @@ fastestmirror=1
 
 ## Debuginfo
 [ha-debuginfo]
-name=AlmaLinux 8.4-beta - HighAvailability debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/debug/$basearch/
+name=AlmaLinux $releasever - HighAvailability debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/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 5977f50..1c693d3 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -8,12 +8,12 @@
 %define base_release_version 8
 %define full_release_version 8.4
 %define dist_release_version 8
-%define upstream_rel_long 8.4-1
+%define upstream_rel_long 8.4-0.6
 %define upstream_rel 8.4
-%define almalinux_rel 1
+%define almalinux_rel 2
 %define dist .el%{dist_release_version}
 
-%define beta Beta
+# define beta Beta
 
 # The anaconda scripts in %%{_libexecdir} can create false requirements
 %global __requires_exclude_from %{_libexecdir}
@@ -86,6 +86,7 @@ PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{relea
 ANSI_COLOR="0;34"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{full_release_version}:%{?beta:%(echo %{beta} | tr [A-Z] [a-z])}%{?!beta:GA}"
 HOME_URL="https://almalinux.org/"
+DOCUMENTATION_URL="https://wiki.almalinux.org/"
 BUG_REPORT_URL="https://bugs.almalinux.org/"
 
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{base_release_version}"
diff --git a/almalinux.repo b/almalinux.repo
index f958373..485a8c9 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -1,36 +1,36 @@
 # almalinux.repo
 
 [baseos]
-name=AlmaLinux 8.4-beta - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/BaseOS/$basearch/os/
+name=AlmaLinux $releasever - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream]
-name=AlmaLinux 8.4-beta - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/AppStream/$basearch/os/
+name=AlmaLinux $releasever - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools]
-name=AlmaLinux 8.4-beta - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/PowerTools/$basearch/os/
+name=AlmaLinux $releasever - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras]
-name=AlmaLinux 8.4-beta - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/extras/$basearch/os/
+name=AlmaLinux $releasever - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -38,36 +38,36 @@ fastestmirror=1
 
 ## Sources
 [baseos-source]
-name=AlmaLinux 8.4-beta - BaseOS Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos-source
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/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/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream-source]
-name=AlmaLinux 8.4-beta - AppStream Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream-source
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/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/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools-source]
-name=AlmaLinux 8.4-beta - PowerTools Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools-source
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/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/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras-source]
-name=AlmaLinux 8.4-beta - Extras Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras-source
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/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/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -75,36 +75,36 @@ fastestmirror=1
 
 ## Debuginfo
 [baseos-debuginfo]
-name=AlmaLinux 8.4-beta - BaseOS debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/BaseOS/debug/$basearch/
+name=AlmaLinux $releasever - BaseOS debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream-debuginfo]
-name=AlmaLinux 8.4-beta - AppStream debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/AppStream/debug/$basearch/
+name=AlmaLinux $releasever - AppStream debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools-debuginfo]
-name=AlmaLinux 8.4-beta - PowerTools debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/PowerTools/debug/$basearch/
+name=AlmaLinux $releasever - PowerTools debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras-debuginfo]
-name=AlmaLinux 8.4-beta - Extras debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/extras/debug/$basearch/
+name=AlmaLinux $releasever - Extras debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux