[mingw32-filesystem] Remove the mingw32-pkg-config wrapper as well

[Kalev Lember]

commit 32d11948823c958e8443d16d8dc1ca95701dd380
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Jan 31 22:04:23 2012 +0200

    Remove the mingw32-pkg-config wrapper as well

 macros.mingw32          |    2 --
 mingw32-filesystem.spec |    9 ++++++---
 mingw32-scripts.sh      |    6 +-----
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index 54cf300..d80d38e 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -99,8 +99,6 @@ package or when debugging this package.\
   done; \
   unset x i
 
-%_mingw32_pkg_config %{_mingw32_target}-pkg-config
-
 %_mingw32_configure %{_mingw32_env} ; \
   __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
   $__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 68034b2..5c571e4 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        69
-Release:        12%{?dist}
+Release:        13%{?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 mingw32-cmake mingw32-qmake-qt4; do
+for i in mingw32-configure mingw32-make mingw32-cmake mingw32-qmake-qt4; do
   ln -s %{_libexecdir}/mingw32-scripts $i
 done
 popd
@@ -179,7 +179,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
 %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config
 %{_bindir}/mingw32-configure
 %{_bindir}/mingw32-make
-%{_bindir}/mingw32-pkg-config
 %{_bindir}/mingw32-cmake
 %{_bindir}/mingw32-qmake-qt4
 %{_libexecdir}/mingw32-scripts
@@ -190,6 +189,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
 
 
 %changelog
+* Tue Jan 31 2012 Kalev Lember <kalevlember at gmail.com> - 69-13
+- Remove the mingw32-pkg-config wrapper as well, now that we have separate
+  mingw32-pkg-config package
+
 * Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 69-12
 - Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now
   have a mingw32-pkg-config package
diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh
index f068e0a..8f36dd2 100755
--- a/mingw32-scripts.sh
+++ b/mingw32-scripts.sh
@@ -21,11 +21,7 @@
 # This is a useful command-line script through which one can use the
 # macros from mingw32-macros.mingw32 cross-compilation. 
 
-if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then
-    NAME="_mingw32_pkg_config"
-else
-    NAME="_`basename $0|tr -- - _`"
-fi
+NAME="_`basename $0|tr -- - _`"
 
 # NOTE: The use of 'eval' in combination with '$@' is a potential security risk
 #       We should find a more safe replacement for this command