From 45b6f0d61dffabe37b6cebef925980418e48ca48 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Wed, 7 Nov 2012 22:45:44 +0100 Subject: [PATCH] pck-update: restore build requirement detection for *.so requirements Signed-off-by: Davide Madrisan --- ChangeLog | 4 ++++ plugins/pck-update.in | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86c8204..eb23d1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,10 @@ Fri Nov 09 2012 Davide Madrisan * po/it/config-getvar - Davide Madrisan: Updated. ++ bugfix + * plugins/pck-update.in - Silvan Calarco: + Restore build requirement detection for *.so requirements + ------------------------------------------------------------------------------- Changes in version 1.14.0 diff --git a/plugins/pck-update.in b/plugins/pck-update.in index fd9c1e6..9d06490 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -2244,15 +2244,15 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")" echo "\ #$req: library not reported by ldconfig; run \`ldconfig' and try again" fi - elif [[ "$req" =~ .*\(.*\) ]]; then - # other a(b) requirements + elif [[ "$req" =~ .*\(.*\) || "$req" =~ .*\.so ]]; then + # a(b) requirement or *.so library rpm -q --qf %{name} --whatprovides "$req" &>/dev/null && buildreq="$(rpm -q --qf %{name} --whatprovides "$req")" || echo "#$req: unidentified build requirement" else # other requirements probably coming from static 'Requires:' # so don't treat them as build requirements - notify.warning $"ignoring requirement: \`${NOTE}$req${NORM}'" + notify.warning $"ignoring requirement"": \`${NOTE}$req${NORM}'" fi if [ -n "$buildreq" \ -a "${buildreq/%-devel/}" = "$buildreq" ]; then