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

pck-update: try to avoid reporting package requirements set with 'Requires:' as build requirements. Unless not better identified requirements are in 'a(b)' form don't report them as build requirements to avoid breaking stage1 builds and causing unneeded circular dependencies

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-01 22:27:12 +01:00
parent 4623dd6866
commit 3716f5e0c2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -69,6 +69,12 @@ Changes in version 1.12.6
function is not the expected one (that is a string made by the current function is not the expected one (that is a string made by the current
date in the format YYYYMMDD followed by "git"). date in the format YYYYMMDD followed by "git").
* pck-update - Silvan Calarco:
Try to avoid reporting package requirements set with 'Requires:' as build
requirements. Unless not better identified requirements are in 'a(b)' form
don't report them as build requirements to avoid breaking stage1 builds and
causing unneeded circular dependencies.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in version 1.12.5 Changes in version 1.12.5

8
plugins/pck-update.in
View File

@ -2244,11 +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
else elif [[ "$req" =~ .*\(.*\) ]]; then
# unidentified requirement # other a(b) requirements
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
# other requirements probably coming from static 'Requires:'
# so don't treat them as build requirements
:
fi fi
if [ -n "$buildreq" \ if [ -n "$buildreq" \
-a "${buildreq/%-devel/}" = "$buildreq" ]; then -a "${buildreq/%-devel/}" = "$buildreq" ]; then