Generate pkgconfig() R for Requires.private

"pkg-config --exists" needs Requires and Requires.private to be
fullfilled.

diff --git a/rpm-5.4.4-pkgconfigdeps-check-path.patch b/rpm-5.4.4-pkgconfigdeps-check-path.patch
index 39858fea28b9b1c9ad0e140a55cdc8d31feb6a4c..5309292d871c438927e2f6506cfda5fd21a3976a 100644 (file)
--- a/rpm-5.4.4-pkgconfigdeps-check-path.patch
+++ b/rpm-5.4.4-pkgconfigdeps-check-path.patch
@@ -61,7 +61,7 @@
 +          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
++          $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"

diff --git a/rpm.spec b/rpm.spec
index d9bea04178c56bb046d6e464bf5511529d90c08c..426ddef64adbd88e77d9a1bf88c6388696b295ea 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       13
+Release:       14
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm