commit 9781763c8bcd25f3d21c3a6bcaa67de146309c89 Author: Kalev Lember kalev@smartlink.ee Date: Tue May 24 10:50:37 2011 +0300

Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/

Right now only mingw32-spice-protocol drops files in share/pkgconfig/, but there are most likely more packages to come.

macros.mingw32 | 4 ++-- mingw32-filesystem.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) --- diff --git a/macros.mingw32 b/macros.mingw32 index ac86bab..c89cd7e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -72,7 +72,7 @@ package or when debugging this package.\ %{nil}

%_mingw32_env HOST_CC=gcc; export HOST_CC; \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ @@ -97,7 +97,7 @@ package or when debugging this package.\ unset x i

%_mingw32_pkg_config \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/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 7fed193..3f705ec 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil}

Name: mingw32-filesystem -Version: 68 -Release: 3%{?dist} +Version: 69 +Release: 1%{?dist} Summary: MinGW base filesystem and environment

Group: Development/Libraries @@ -169,6 +169,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32

%changelog +* Tue May 24 2011 Kalev Lember kalev@smartlink.ee - 69-1 +- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ + * Mon May 23 2011 Kalev Lember kalev@smartlink.ee - 68-3 - Own etc/, share/pkgconfig/, share/xml/ directories