From acbfaf6cf905371c022fada2fbcfbfab5eb686fd Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 03:19:02 +0000
Subject: [PATCH] Merge r7389 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7649 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile     | 3 ++-
 scst.spec.in | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9dc28bc2d..7510b4f1d 100644
--- a/Makefile
+++ b/Makefile
@@ -440,7 +440,8 @@ scst-rpm:
 	  mkdir -p $${rpmtopdir}/$$d;					\
 	done &&								\
 	cp scst-$(VERSION).tar.bz2 $${rpmtopdir}/SOURCES &&		\
-	sed "s/@rpm_version@/$(VERSION)/g"				\
+	sed -e "s/@rpm_version@/$(VERSION)/g"				\
+	    -e "s|@depmod@|$(shell which depmod)|g"			\
 		<$${name}.spec.in >$${name}.spec &&			\
 	MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}"	\
 	    $(if $(KVER),--define="%kversion $(KVER)")			\
diff --git a/scst.spec.in b/scst.spec.in
index e9289e773..6b6a88a76 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -70,7 +70,7 @@ BuildRequires:	%{?kernel_rpm:%{kernel_rpm} = %{krpmver} %{kernel_devel_rpm} = %{
 Source:		%{kmod_name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 AutoReqProv:	no
-Requires:	%{?kernel_rpm:%{kernel_rpm} = %{krpmver}} %{expand:%%(for c in depmod find rm; do echo -n "$(PATH=/sbin:/bin:/usr/sbin:/usr/bin which $c) "; done)}
+Requires:	%{?kernel_rpm:%{kernel_rpm} = %{krpmver}} @depmod@ %{expand:%%(for c in find rm; do echo -n "$(PATH=/usr/sbin:/usr/bin:/sbin:/bin which $c) "; done)}
 Provides:	scst
 
 %description
@@ -160,7 +160,7 @@ rm -f /usr/local/sbin/iscsi-scstd
 rm -rf /usr/local/include/scst
 
 %post
-/sbin/depmod -a %{kversion}
+@depmod@ -a %{kversion}
 
 %files
 %defattr(0644,root,root,0755)