From 7182e03e387b8346929fceb546b7a8c3f8408d2f34028d2a087c6c0dc7480104 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 24 Aug 2010 15:14:19 +0000
Subject: [PATCH] checked in (request 45898)

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

diff --git a/pkgconfig-0.24.diff b/pkgconfig-0.24.diff
deleted file mode 100644
index 02291fd..0000000
--- a/pkgconfig-0.24.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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 4dcbb0d..89080a3 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-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 f1a39ea..6b35817 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -114,7 +114,6 @@ 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
@@ -176,7 +175,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 -P 81
+%patch -P 80
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov