openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pck-update.in: add python dist deps as they are in build requirements block

Browse Source
This commit is contained in:
Silvan Calarco 2021-04-18 15:12:00 +02:00
parent 308cd6bb7b
commit 5203151334
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/pck-update.in
View File

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