rpm-5.4.4-pkgconfigdeps-check-path.patch

   1 --- rpm-5.4.4/scripts/pkgconfigdeps.sh.pc_path~ 2011-11-17 15:08:42.400054348 +0100
   2 +++ rpm-5.4.4/scripts/pkgconfigdeps.sh  2011-11-17 15:08:44.380056984 +0100
   3 @@ -16,20 +16,22 @@ case $1 in
   4      while read filename ; do
   5      case "${filename}" in
   6      *.pc)
   7 -       # Query the dependencies of the package.
   8 -       DIR=`dirname ${filename}`
   9 -       PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
  10 -       export PKG_CONFIG_PATH
  11 -       $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
  12 -           [ -n "$n" ] || continue
  13 -           # We have a dependency.  Make a note that we need the pkgconfig
  14 -           # tool for this package.
  15 -           if  [ -n "$r" ] && [ -n "$v" ]; then
  16 -               echo "pkgconfig($n) $r $v"
  17 -           else
  18 -               echo "pkgconfig($n)"
  19 -           fi
  20 -       done
  21 +       if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then
  22 +           # Query the dependencies of the package.
  23 +           DIR=`dirname ${filename}`
  24 +           PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
  25 +           export PKG_CONFIG_PATH
  26 +           $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
  27 +               [ -n "$n" ] || continue
  28 +               # We have a dependency.  Make a note that we need the pkgconfig
  29 +               # tool for this package.
  30 +               if  [ -n "$r" ] && [ -n "$v" ]; then
  31 +                   echo "pkgconfig($n) $r $v"
  32 +               else
  33 +                   echo "pkgconfig($n)"
  34 +               fi
  35 +           done
  36 +       fi
  37         ;;
  38      esac
  39      done
  40 @@ -39,20 +41,22 @@ case $1 in
  41      while read filename ; do
  42      case "${filename}" in
  43      *.pc)
  44 -       [ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
  45 -       # Query the dependencies of the package.
  46 -       DIR=`dirname ${filename}`
  47 -       PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
  48 -       export PKG_CONFIG_PATH
  49 -       $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
  50 -           [ -n "$n" ] || continue
  51 -           if  [ -n "$r" ] && [ -n "$v" ]; then
  52 -               echo "pkgconfig($n) $r $v"
  53 -           else
  54 -               echo "pkgconfig($n)"
  55 -           fi
  56 -           oneshot=""
  57 -       done
  58 +       if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then
  59 +           [ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
  60 +           # Query the dependencies of the package.
  61 +           DIR=`dirname ${filename}`
  62 +           PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
  63 +           export PKG_CONFIG_PATH
  64 +           $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
  65 +               [ -n "$n" ] || continue
  66 +               if  [ -n "$r" ] && [ -n "$v" ]; then
  67 +                   echo "pkgconfig($n) $r $v"
  68 +               else
  69 +                   echo "pkgconfig($n)"
  70 +               fi
  71 +               oneshot=""
  72 +           done
  73 +       fi
  74         ;;
  75      esac
  76      done