mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-20 15:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r7389 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7649 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 03:19:02 +00:00
parent f53ea59fb8
commit acbfaf6cf9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -1
View File
@@ -440,7 +440,8 @@ scst-rpm:
mkdir -p $${rpmtopdir}/$$d; \ mkdir -p $${rpmtopdir}/$$d; \
done && \ done && \
cp scst-$(VERSION).tar.bz2 $${rpmtopdir}/SOURCES && \ 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 && \ <$${name}.spec.in >$${name}.spec && \
MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}" \ MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}" \
$(if $(KVER),--define="%kversion $(KVER)") \ $(if $(KVER),--define="%kversion $(KVER)") \
scst.spec.in
+2 -2
View File
@@ -70,7 +70,7 @@ BuildRequires: %{?kernel_rpm:%{kernel_rpm} = %{krpmver} %{kernel_devel_rpm} = %{
Source: %{kmod_name}-%{version}.tar.bz2 Source: %{kmod_name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: no 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 Provides: scst
%description %description
@@ -160,7 +160,7 @@ rm -f /usr/local/sbin/iscsi-scstd
rm -rf /usr/local/include/scst rm -rf /usr/local/include/scst
%post %post
/sbin/depmod -a %{kversion} @depmod@ -a %{kversion}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)