rpms/rpm/devel rpm-4.6.0-rc2-pkgconfig-provides.patch, NONE, 1.1 rpm.spec, 1.310, 1.311

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10528

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-rc2-pkgconfig-provides.patch 
Log Message:
- fix pkg-config provide generation when pc's depend on each other (#473814)


rpm-4.6.0-rc2-pkgconfig-provides.patch:

--- NEW FILE rpm-4.6.0-rc2-pkgconfig-provides.patch ---
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.


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- rpm.spec	1 Dec 2008 11:45:31 -0000	1.310
+++ rpm.spec	2 Dec 2008 16:35:22 -0000	1.311
@@ -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 @@
 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 @@
 %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 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 02 2008 Panu Matilainen <pmatilai at redhat.com>
+- fix pkg-config provide generation when pc's depend on each other (#473814)
+
 * Mon Dec 01 2008 Jindrich Novy <jnovy at redhat.com>
 - include rpmfileutil.h from rpmmacro.h, unbreaks
   net-snmp (#473420)