From 92ccc6e10a514b063c29b4b642b19283a1235396 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Jan 31 2012 19:38:26 +0000
Subject: Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config package


---

diff --git a/macros.mingw32 b/macros.mingw32
index 95ac080..54cf300 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -99,8 +99,7 @@ package or when debugging this package.\
   done; \
   unset x i
 
-%_mingw32_pkg_config \
-  PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config
+%_mingw32_pkg_config %{_mingw32_target}-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 940476e..ec2147f 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        69
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -103,7 +103,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do
+for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do
   ln -s %{_libexecdir}/mingw32-scripts $i
 done
 popd
@@ -191,6 +191,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
 
 
 %changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-12
+- Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now
+  have a mingw32-pkg-config package
+
 * Tue Jan 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-11
 - Set Boost_COMPILER to -gcc47 in cmake toolchain file