--- rpm-5.4.4/scripts/pkgconfigdeps.sh.pc_path~ 2011-11-17 15:08:42.400054348 +0100 +++ rpm-5.4.4/scripts/pkgconfigdeps.sh 2011-11-17 15:08:44.380056984 +0100 @@ -16,20 +16,22 @@ case $1 in while read filename ; do case "${filename}" in *.pc) - # Query the dependencies of the package. - DIR=`dirname ${filename}` - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" - export PKG_CONFIG_PATH - $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do - [ -n "$n" ] || continue - # We have a dependency. Make a note that we need the pkgconfig - # tool for this package. - if [ -n "$r" ] && [ -n "$v" ]; then - echo "pkgconfig($n) $r $v" - else - echo "pkgconfig($n)" - fi - done + if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then + # Query the dependencies of the package. + DIR=`dirname ${filename}` + PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" + export PKG_CONFIG_PATH + $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do + [ -n "$n" ] || continue + # We have a dependency. Make a note that we need the pkgconfig + # tool for this package. + if [ -n "$r" ] && [ -n "$v" ]; then + echo "pkgconfig($n) $r $v" + else + echo "pkgconfig($n)" + fi + done + fi ;; esac done @@ -39,20 +41,22 @@ case $1 in while read filename ; do case "${filename}" in *.pc) - [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" - # Query the dependencies of the package. - DIR=`dirname ${filename}` - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" - export PKG_CONFIG_PATH - $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do - [ -n "$n" ] || continue - if [ -n "$r" ] && [ -n "$v" ]; then - echo "pkgconfig($n) $r $v" - else - echo "pkgconfig($n)" - fi - oneshot="" - done + if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then + [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" + # Query the dependencies of the package. + DIR=`dirname ${filename}` + PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" + export PKG_CONFIG_PATH + $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do + [ -n "$n" ] || continue + if [ -n "$r" ] && [ -n "$v" ]; then + echo "pkgconfig($n) $r $v" + else + echo "pkgconfig($n)" + fi + oneshot="" + done + fi ;; esac done