From 5203151334ba6ca38ef34c6741e0bc99449cafc6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 18 Apr 2021 15:12:00 +0200 Subject: [PATCH] pck-update.in: add python dist deps as they are in build requirements block --- plugins/pck-update.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/pck-update.in b/plugins/pck-update.in index e6507e1..db9d544 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -2167,8 +2167,6 @@ $SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1" notify.note "${NOTE}"$"building the srpm package""${NORM}..." # as the dependencies check is done before, it is safe to pass # --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 "\ rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts \ $SRPM_SPECFILE_WITH_PATH 2>&1" @@ -2319,6 +2317,7 @@ build the list of the build requirements""${NORM}" done [ "$buildreq" ] || echo "BuildRequires: $req" elif [ "${req}" = "python(abi)" ]; then + # FIXME: libpython-devel should be defined in autospec.conf # python requirement reqver=${line/*= /} buildreq="libpython${reqver/\.}-devel" @@ -2375,6 +2374,9 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")" echo "\ #$req: library not reported by ldconfig; run \`ldconfig' and try again" fi + elif [[ "$req" =~ .*python.*dist\(.*\).* ]]; then + # Python dist requirement + buildreq="$req" elif [[ "$req" =~ .*\(.*\) || "$req" =~ .*\.so ]]; then # a(b) requirement or *.so library rpm -q --qf %{name} --whatprovides "$req" &>/dev/null &&