From 184c9810dca4a992b70d3ea42f0e9e6bf24b5abf Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 03:07:45 +0000
Subject: [PATCH] Merge r7374 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7634 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst.spec.in                | 12 +++++++++++-
 scstadmin/scstadmin.spec.in |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/scst.spec.in b/scst.spec.in
index aeab505a0..8cb7e9295 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -48,7 +48,17 @@
 %{echo:krpmver=%{krpmver}
 }}
 # kernel_devel_rpm: Name of the kernel development RPM.
-%{?kernel_rpm:%define kernel_devel_rpm %{kernel_rpm}-devel}
+%if 0%{?kernel_rpm:1}
+%if %([ %{kernel_rpm} = kernel-core ]; echo $((1-$?)))
+# Fedora
+%define kernel_devel_rpm kernel-devel
+%else
+# Other Linux distros
+%define kernel_devel_rpm %{kernel_rpm}-devel
+%endif
+%{echo:kernel_devel_rpm=%{kernel_devel_rpm}
+}
+%endif
 # Version of the RPM that is being built.
 %define rpm_version @rpm_version@
 # Make command with or without flags.
diff --git a/scstadmin/scstadmin.spec.in b/scstadmin/scstadmin.spec.in
index 4c084d6dd..37a99eb6b 100644
--- a/scstadmin/scstadmin.spec.in
+++ b/scstadmin/scstadmin.spec.in
@@ -40,6 +40,8 @@ if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \
   fi; \
   rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod; set +x
 
+%global debug_package %{nil}
+
 %prep
 
 %setup -q