Merge branch 'c8' into a8

SPECS/opa-ff.spec

@@ -1,7 +1,7 @@
 Name:    opa-ff
 Epoch: 1
 Version: 10.11.1.3.1
-Release: 1%{?dist}
+Release: 1%{?dist}.alma
 Summary: Intel Omni-Path basic tools and libraries for fabric management
 License: BSD or GPLv2
 Url: https://github.com/cornelisnetworks/opa-ff
@@ -73,6 +73,9 @@ This package contains the necessary headers for opamgt development.
 # Make it possible to override hardcoded compiler flags
 sed -i -r -e 's/(release_C(C)?OPT_Flags\s*)=/\1?=/' Makerules/Target.LINUX.GNU.*
 
+# Add AlmaLinux detection
+sed -i 's/rhel)/rhel|almalinux|AlmaLinux)/' MakeTools/funcs-ext.sh
+
 %build
 export CFLAGS='%{optflags}'
 export CXXFLAGS='%{optflags}'
@@ -394,10 +397,12 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_includedir}/opamgt
 
 %changelog
+* Tue May 16 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 10.11.1.3.1-1.alma
+- Fix build on AlmaLinux
+
 * Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 10.11.1.3.1-1
 - Update to upstream version 10.11.1.3.1.
 - Resolves: rhbz#2110930
-
 * Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 10.11.0.2-1
 - Rebase to latest upstream release v10.11.0.2
 - Resolves: bz1989157