[pkgconfig] Update to pkg-config 0.26

[Christophe Fergeau]

commit c223ee7a50a82e13358f6bea29e7eb663450539c
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Apr 26 09:57:59 2012 +0200

    Update to pkg-config 0.26
    
    All patches are dropped since they were all upstreamed. pkg-config
    will no longer fallback to calling gnome-vfs-config, imlib-config,
    orbit-config, or gnome-config when the queried package is
    "libgnomevfs", "imlib", "orbit-client" or "orbit-server". I don't
    have any of these installed on my system. imlib-devel ships a .pc
    file these days, so do ORBit, and gnome-vfs is no longer in the distro
    (gnome-vfs-2.0 is), so this should be a safe change.

 .gitignore                        |    1 +
 pkg-config-0.21-compat-loop.patch |   65 -------------------------------------
 pkg-config-dnl.patch              |   21 ------------
 pkg-config-lib64-excludes.patch   |   63 -----------------------------------
 pkgconfig.spec                    |   19 +++-------
 popt-compat.patch                 |   61 ----------------------------------
 sources                           |    2 +-
 7 files changed, 8 insertions(+), 224 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd68b87..c57ab28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pkg-config-0.25.tar.gz
+/pkg-config-0.26.tar.gz
diff --git a/pkgconfig.spec b/pkgconfig.spec
index 484456d..976353b 100644
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
-Version: 0.25
-Release: 4%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -10,14 +10,6 @@ Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{ver
 BuildRequires: glib2-devel
 BuildRequires: popt-devel
 
-# don't call out to glib-config, since our glib-config is a pkg-config wrapper
-Patch2:  pkg-config-0.21-compat-loop.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=16095
-Patch3: pkg-config-lib64-excludes.patch
-# workaround for breakage with autoconf 2.66
-# https://bugzilla.redhat.com/show_bug.cgi?id=611781
-Patch4: pkg-config-dnl.patch
-
 Provides: pkgconfig(pkg-config) = %{version}
 
 %description
@@ -27,9 +19,6 @@ compiler and linker flags.
 
 %prep
 %setup -n pkg-config-%{version} -q
-%patch2 -p1 -b .compat-loop
-%patch3 -p0 -b .lib64
-%patch4 -p1 -R -b .dnl
 
 %build
 %configure \
@@ -57,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pkg-config
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Apr 26 2012 Christophe Fergeau <cfergeau at redhat.com> - 1:0.26-1
+- Update to 0.26 (#802480)
+- Drop upstreamed patches
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.25-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 17a692f..765d2a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3270bab3f4b69b7dc6dbdacbcae9745  pkg-config-0.25.tar.gz
+47525c26a9ba7ba14bf85e01509a7234  pkg-config-0.26.tar.gz