From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Mar 2012 10:35:57 +0000 (+0100)
Subject: pakfire: Add patch from upstream to fix pkgconfig dependencies.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=897927666dbcf3294678a30842cda9adaeafb7d8;p=ipfire-3.x.git

pakfire: Add patch from upstream to fix pkgconfig dependencies.

pkgconfig was added to the provides list instead of the requires
list when a .pc file was in the package.
---

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3217f4337..f615de849 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.20
-release    = 6
+release    = 7
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch b/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch
new file mode 100644
index 000000000..1304cb927
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch
@@ -0,0 +1,37 @@
+commit 6230230c96c4961d6e5e7aed176d4859dd744b03
+Author: Michael Tremer <michael.tremer@ipfire.org>
+Date:   Sat Mar 17 13:12:57 2012 +0100
+
+    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 8a3e3cb..0be2de7 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 044c59f..9a98c32 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