Merge branch 'c8' into a8

SOURCES/dist.sh

@@ -25,7 +25,7 @@ function check_rhl {
 }
 
 function check_rhel {
-    egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM
+    egrep -q "(Enterprise|Advanced|AlmaLinux)" $RELEASEFILE && echo $DISTNUM
 }
 
 function check_fedora {

SPECS/redhat-rpm-config.spec

@@ -7,7 +7,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 131
-Release: 1%{?dist}
+Release: 1%{?dist}.alma
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -268,13 +268,14 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Tue May 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 131-1.alma
+- Fix AlmaLinux detection
+
 * Wed Feb 08 2023 Nick Clifton  <nickc@redhat.com> - 131-1
 - Fix triggers for the installation and removal of gcc-plugin-annobin.  (#2168233)
-
 * Tue Apr 05 2022 Nick Clifton <nickc@redhat.com> = 130-1
 - Select between gcc-built and annobin-built versions of the annobin plugin.
   (#2067153)
-
 * Wed Mar 23 2022 Michal Domonkos <mdomonko@redhat.com> - 129-1
 - Fix handling of files without newlines in brp-mangle-shebang (#2063036)