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

pck-update: restore build requirement detection for *.so requirements

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-07 22:45:44 +01:00
parent f929f20486
commit 45b6f0d61d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -17,6 +17,10 @@ Fri Nov 09 2012 Davide Madrisan <davide.madrisan(a)gmail.com>
* po/it/config-getvar - Davide Madrisan: * po/it/config-getvar - Davide Madrisan:
Updated. Updated.
+ bugfix
* plugins/pck-update.in - Silvan Calarco:
Restore build requirement detection for *.so requirements
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in version 1.14.0 Changes in version 1.14.0

6
plugins/pck-update.in
View File

@ -2244,15 +2244,15 @@ $(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" =~ .*\(.*\) ]]; then elif [[ "$req" =~ .*\(.*\) || "$req" =~ .*\.so ]]; then
# other a(b) requirements # a(b) requirement or *.so library
rpm -q --qf %{name} --whatprovides "$req" &>/dev/null && rpm -q --qf %{name} --whatprovides "$req" &>/dev/null &&
buildreq="$(rpm -q --qf %{name} --whatprovides "$req")" || buildreq="$(rpm -q --qf %{name} --whatprovides "$req")" ||
echo "#$req: unidentified build requirement" echo "#$req: unidentified build requirement"
else else
# other requirements probably coming from static 'Requires:' # other requirements probably coming from static 'Requires:'
# so don't treat them as build requirements # so don't treat them as build requirements
notify.warning $"ignoring requirement: \`${NOTE}$req${NORM}'" notify.warning $"ignoring requirement"": \`${NOTE}$req${NORM}'"
fi fi
if [ -n "$buildreq" \ if [ -n "$buildreq" \
-a "${buildreq/%-devel/}" = "$buildreq" ]; then -a "${buildreq/%-devel/}" = "$buildreq" ]; then