From 2c67134589cbb8f8d42ddfca680582b66308ec3b Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: May 14 2011 12:07:09 +0000
Subject: Don't unset PKG_CONFIG_PATH in the wrapper scripts mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171)


---

diff --git a/macros.mingw32 b/macros.mingw32
index f349740..ac86bab 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -97,9 +97,7 @@ package or when debugging this package.\
   unset x i
 
 %_mingw32_pkg_config \
-  PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
-  unset PKG_CONFIG_PATH; \
-  pkg-config
+  PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config
 
 %_mingw32_configure %{_mingw32_env} ; \
   __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index c02e5fd..5411573 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        66
+Version:        67
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -168,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 14 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 67-1
+- Don't unset PKG_CONFIG_PATH in the wrapper scripts
+  mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171)
+
 * Sun May 01 2011 Kalev Lember <kalev@smartlink.ee> - 66-1
 - Override boost library suffix in cmake toolchain file