Merge branch 'a8' into a8-rhel

90-default.preset

@@ -195,5 +195,5 @@ enable dbus-daemon.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1967515
 enable nfs-client.target
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2106814
+# https://bugzilla.redhat.com/show_bug.cgi?id=2126605
 enable clevis-luks-askpass.path

almalinux-release.spec

@@ -1,14 +1,14 @@
 %define debug_package %{nil}
 %define product_family AlmaLinux
-%define release_name Stone Smilodon
+%define release_name Sapphire Caracal
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.7
+%define full_release_version 8.8
 %define dist_release_version 8
-%define upstream_rel_long 8.7-0.3
-%define upstream_rel 8.7
-%define almalinux_rel 2
+%define upstream_rel_long 8.8-0.8
+%define upstream_rel 8.8
+%define almalinux_rel 1
 %define dist .el%{dist_release_version}
 
 %define beta Beta
@@ -183,7 +183,7 @@ rm -rf %{buildroot}
 ##/etc/centos-release-upstream
 /etc/almalinux-release
 /etc/almalinux-release-upstream
-/etc/dnf/
+/etc/dnf/vars/*
 /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
@@ -202,13 +202,19 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/issue.net
 /etc/rpm/macros.dist
 %{_docdir}/redhat-release
-%{_docdir}/almalinux-release/*
+%{_docdir}/almalinux-release
 %{_datadir}/redhat-release
-%{_datadir}/almalinux-release/*
+%{_datadir}/almalinux-release
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
+* Tue May 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.8-1
+- 8.8 stable release
+
+* Sat Nov 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-3
+- Fixed ownership of dirs (albz#328)
+
 * Wed Nov 09 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-2
 - Add stream dnf variable for CentOS SIG repos compatibility