pck-update.in: add python dist deps as they are in build requirements block
This commit is contained in:
parent
308cd6bb7b
commit
5203151334
@ -2167,8 +2167,6 @@ $SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1"
|
|||||||
notify.note "${NOTE}"$"building the srpm package""${NORM}..."
|
notify.note "${NOTE}"$"building the srpm package""${NORM}..."
|
||||||
# as the dependencies check is done before, it is safe to pass
|
# as the dependencies check is done before, it is safe to pass
|
||||||
# --nodeps to non-simulated build commands.
|
# --nodeps to non-simulated build commands.
|
||||||
# NOTE: it seems that since rpm 4.16 above is not true thus
|
|
||||||
# --nodeps has been removed from build commands
|
|
||||||
eval "\
|
eval "\
|
||||||
rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts \
|
rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts \
|
||||||
$SRPM_SPECFILE_WITH_PATH 2>&1"
|
$SRPM_SPECFILE_WITH_PATH 2>&1"
|
||||||
@ -2319,6 +2317,7 @@ build the list of the build requirements""${NORM}"
|
|||||||
done
|
done
|
||||||
[ "$buildreq" ] || echo "BuildRequires: $req"
|
[ "$buildreq" ] || echo "BuildRequires: $req"
|
||||||
elif [ "${req}" = "python(abi)" ]; then
|
elif [ "${req}" = "python(abi)" ]; then
|
||||||
|
# FIXME: libpython-devel should be defined in autospec.conf
|
||||||
# python requirement
|
# python requirement
|
||||||
reqver=${line/*= /}
|
reqver=${line/*= /}
|
||||||
buildreq="libpython${reqver/\.}-devel"
|
buildreq="libpython${reqver/\.}-devel"
|
||||||
@ -2375,6 +2374,9 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")"
|
|||||||
echo "\
|
echo "\
|
||||||
#$req: library not reported by ldconfig; run \`ldconfig' and try again"
|
#$req: library not reported by ldconfig; run \`ldconfig' and try again"
|
||||||
fi
|
fi
|
||||||
|
elif [[ "$req" =~ .*python.*dist\(.*\).* ]]; then
|
||||||
|
# Python dist requirement
|
||||||
|
buildreq="$req"
|
||||||
elif [[ "$req" =~ .*\(.*\) || "$req" =~ .*\.so ]]; then
|
elif [[ "$req" =~ .*\(.*\) || "$req" =~ .*\.so ]]; then
|
||||||
# a(b) requirement or *.so library
|
# a(b) requirement or *.so library
|
||||||
rpm -q --qf %{name} --whatprovides "$req" &>/dev/null &&
|
rpm -q --qf %{name} --whatprovides "$req" &>/dev/null &&
|
||||||
|
Loading…
Reference in New Issue
Block a user