diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 21d9464..ca9105f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 44 +Version: 45 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 28 2009 Richard W.M. Jones - 45-1 +- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig + is never searched. + * Mon Jan 26 2009 Richard W.M. Jones - 44-1 - Install rpmlint overrides file to suppress some rpmlint warnings. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index cbc05ca..5be5230 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -54,7 +54,7 @@ %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %_mingw32_env HOST_CC=gcc; export HOST_CC; \ - PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \