From af55e8d9b311e5a54fdc65b3c11dd3da01a551f6 Mon Sep 17 00:00:00 2001
From: dodexahedron <dodexahedron@users.noreply.github.com>
Date: Sun, 2 Aug 2020 20:17:21 -0700
Subject: [PATCH 1/2] Fix scst-dkms-rpm build for EL mainline kernels

---
 scst-dkms.spec.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scst-dkms.spec.in b/scst-dkms.spec.in
index af407f750..ccacdcbbb 100644
--- a/scst-dkms.spec.in
+++ b/scst-dkms.spec.in
@@ -38,6 +38,10 @@
 # CentOSPlus
 %define kernel_devel_rpm kernel-plus-devel
 %else
+%if %([ %{kernel_rpm} = kernel-ml-core ]; echo $((1-$?)))
+# RHEL/CentOS elrepo mainline
+%define kernel_devel_rpm kernel-ml-devel
+%else
 %if %([ %{kernel_rpm} = kernel-core ]; echo $((1-$?)))
 # Fedora
 %define kernel_devel_rpm kernel-devel
@@ -46,6 +50,7 @@
 %define kernel_devel_rpm %{kernel_rpm}-devel
 %endif
 %endif
+%endif
 %{echo:kernel_devel_rpm=%{kernel_devel_rpm}
 }
 %endif

From 5a2b28432998b58e271bb51f9a9c3c98f10be70c Mon Sep 17 00:00:00 2001
From: dodexahedron <dodexahedron@users.noreply.github.com>
Date: Sun, 2 Aug 2020 20:18:36 -0700
Subject: [PATCH 2/2] Fix rpm build for EL mainline kernels

---
 scst.spec.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scst.spec.in b/scst.spec.in
index 8527e2800..005495823 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -43,6 +43,10 @@
 # CentOSPlus
 %define kernel_devel_rpm kernel-plus-devel
 %else
+%if %([ %{kernel_rpm} = kernel-ml-core ]; echo $((1-$?)))
+# RHEL/CentOS elrepo mainline
+%define kernel_devel_rpm kernel-ml-devel
+%else
 %if %([ %{kernel_rpm} = kernel-core ]; echo $((1-$?)))
 # Fedora
 %define kernel_devel_rpm kernel-devel
@@ -51,6 +55,7 @@
 %define kernel_devel_rpm %{kernel_rpm}-devel
 %endif
 %endif
+%endif
 %{echo:kernel_devel_rpm=%{kernel_devel_rpm}
 }
 %endif