From d8ecf1d951f56cc1dc04d7f459abe42098fe75b91fd0192503b670b1813116b5 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Fri, 20 Aug 2010 12:47:14 +0000
Subject: [PATCH] Accepting request 45500 from home:vuntz:branches:Base:System

Copy from home:vuntz:branches:Base:System/rpm via accept of submit request 45500 revision 2.
Request was accepted with message:
forward

OBS-URL: https://build.opensuse.org/request/show/45500
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=59
---
 pkgconfig-0.24.diff | 27 +++++++++++++++++++++++++++
 rpm.changes         |  9 +++++++++
 rpm.spec            |  3 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgconfig-0.24.diff

diff --git a/pkgconfig-0.24.diff b/pkgconfig-0.24.diff
new file mode 100644
index 0000000..02291fd
--- /dev/null
+++ b/pkgconfig-0.24.diff
@@ -0,0 +1,27 @@
+Index: ./scripts/pkgconfigdeps.sh
+===================================================================
+--- ./scripts/pkgconfigdeps.sh
++++ ./scripts/pkgconfigdeps.sh
+@@ -11,6 +11,13 @@ test -x $pkgconfig || {
+     exit 0
+ }
+ 
++`$pkgconfig --exists "pkg-config >= 0.24" 2> /dev/null`
++if [ $? -eq 0 ]; then
++	PRINT_REQUIRES="--print-requires --print-requires-private"
++else
++	PRINT_REQUIRES="--print-requires"
++fi
++
+ case $1 in
+ -P|--provides)
+     while read filename ; do
+@@ -39,7 +46,7 @@ case $1 in
+ 	[ $i -eq 1 ] && echo "$pkgconfig"
+ 	DIR="`dirname ${filename}`"
+ 	export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
+-	$pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
++	$pkgconfig $PRINT_REQUIRES "$filename" 2> /dev/null | while read n r v ; do
+ 	    [ -n "$n" ] || continue
+ 	    echo -n "pkgconfig($n) "
+ 	    [ -n "$r" ] && [ -n "$v" ] && echo -n "$r" "$v"
diff --git a/rpm.changes b/rpm.changes
index 89080a3..4dcbb0d 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 12 17:17:49 CEST 2010 - vuntz@opensuse.org
+
+- Add pkgconfig-0.24.diff: starting with pkg-config 0.24, the
+  --print-requires command was upstreamed, but split in
+  --print-requires and --print-requires-private. We need both in
+  pkgconfigdeps.sh, though. If accepted, the patch should get
+  upstreamed.
+
 -------------------------------------------------------------------
 Tue Jul 20 11:47:29 UTC 2010 - coolo@novell.com
 
diff --git a/rpm.spec b/rpm.spec
index 6b35817..f1a39ea 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -114,6 +114,7 @@ Patch77:        fontprovides.diff
 Patch78:        nosource.diff
 Patch79:        nosignature.diff
 Patch80:        fixsbits.diff
+Patch81:        pkgconfig-0.24.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -175,7 +176,7 @@ rm -f rpmdb/db.h
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
-%patch -P 80
+%patch -P 80 -P 81
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov