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
This commit is contained in:
Bart Van Assche
2018-11-04 03:07:45 +00:00
parent 0b82df143c
commit 184c9810dc
2 changed files with 13 additions and 1 deletions

View File

@@ -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.

View File

@@ -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