diff --git a/macros.mingw32 b/macros.mingw32 index d7200b8..d62b81e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -78,6 +78,10 @@ done; \ unset x i +%_mingw32_pkg_config \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + unset PKG_CONFIG_PATH; \ + 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 bc400e2..b0868c8 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 49 +Version: 50 Release: 3%{?dist} Summary: MinGW base filesystem and environment @@ -22,6 +22,7 @@ Source7: mingw32-rpmlint.config Requires: setup Requires: rpm +Requires: pkgconfig Requires: rpmlint >= 0.85-2 BuildRequires: rpmlint >= 0.85-2 @@ -83,7 +84,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; do +for i in mingw32-configure mingw32-make mingw32-pkg-config; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -150,12 +151,19 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make +%{_bindir}/mingw32-pkg-config %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ /usr/lib/rpm/mingw32-* %changelog +* Fri Mar 27 2009 Richard W.M. Jones - 50-3 +- Fix up and test mingw32-pkg-config changes. + +* Thu Mar 26 2009 Levente Farkas - 50-1 +- Add mingw32-pkg-config. + * Wed Feb 25 2009 Fedora Release Engineering - 49-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild