From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 17 Mar 2012 12:12:57 +0000 (+0100)
Subject: Fix automatic pkgconfig dependencies.
X-Git-Tag: 0.9.21~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6230230c96c4961d6e5e7aed176d4859dd744b03;p=pakfire.git

Fix automatic pkgconfig dependencies.

The pkgconfig package was added as "provides" instead of a
dependency when .pc files were in a package.
---

diff --git a/tools/find-provides b/tools/find-provides
index 8a3e3cb3a..0be2de7b4 100755
--- a/tools/find-provides
+++ b/tools/find-provides
@@ -81,9 +81,6 @@ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
 			# We have a dependency.  Make a note that we need the pkgconfig
 			# tool for this package.
 			echo "pkgconfig(${n}) ${r} ${v}"
-
-			# The dependency on the pkgconfig package itself.
-			echo "pkgconfig"
 		done
 	done | sort -u
 fi
diff --git a/tools/find-requires b/tools/find-requires
index 044c59fef..9a98c324c 100755
--- a/tools/find-requires
+++ b/tools/find-requires
@@ -142,6 +142,9 @@ fi
 pkgconfig=$(which pkg-config)
 if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
 	for file in ${pkgconfig_files}; do
+		# The dependency for the pkgconfig package itself.
+		echo "pkgconfig"
+
 		${pkgconfig} --print-requires --print-requires-private "${file}" 2> /dev/null | while read n r v ; do
 			echo "pkgconfig(${n})" "${r}" "${v}"
 		done