From dd1fdd8b26f7f6719207f87d13958c7100917b90 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@fedoraproject.org>
Date: Dec 02 2008 16:35:22 +0000
Subject: - fix pkg-config provide generation when pc's depend on each other

    (#473814)

---

diff --git a/rpm-4.6.0-rc2-pkgconfig-provides.patch b/rpm-4.6.0-rc2-pkgconfig-provides.patch
new file mode 100644
index 0000000..158d67b
--- /dev/null
+++ b/rpm-4.6.0-rc2-pkgconfig-provides.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh
+index 882d195..6baa0f1 100755
+--- a/scripts/pkgconfigdeps.sh
++++ b/scripts/pkgconfigdeps.sh
+@@ -17,6 +17,8 @@ case $1 in
+     case "${filename}" in
+     *.pc)
+ 	# Query the dependencies of the package.
++	DIR="`dirname ${filename}`"
++	export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
+ 	$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
+ 	    # We have a dependency.  Make a note that we need the pkgconfig
+ 	    # tool for this package.
diff --git a/rpm.spec b/rpm.spec
index c7fb2f1..57aea37 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.5
+Release: 0.%{snapver}.6
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -30,6 +30,7 @@ Patch0: rpm-4.5.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
 Patch2: rpm-4.5.90-gstreamer-provides.patch
 Patch3: rpm-4.5.90-rpmfileutil.patch
+Patch4: rpm-4.6.0-rc2-pkgconfig-provides.patch
 
 # Patches already in upstream
 
@@ -164,6 +165,7 @@ that will manipulate RPM packages and databases.
 %patch1 -p1 -b .pkgconfig-path
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .rpmfileutil
+%patch4 -p1 -b .pkgconfig-provides
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -354,6 +356,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 02 2008 Panu Matilainen <pmatilai@redhat.com>
+- fix pkg-config provide generation when pc's depend on each other (#473814)
+
 * Mon Dec 01 2008 Jindrich Novy <jnovy@redhat.com>
 - include rpmfileutil.h from rpmmacro.h, unbreaks
   net-snmp (#473420)