- Fix up and test mingw32-pkg-config changes.

Thu Mar 26 2009 Levente Farkas <lfarkas@lfarkas.org> - 50-1
- Add mingw32-pkg-config.
This commit is contained in:
Richard W.M. Jones 2009-03-27 09:20:25 +00:00
parent 5f29aa3fbe
commit 7a18fb8141
2 changed files with 14 additions and 2 deletions

View File

@ -78,6 +78,10 @@
done; \ done; \
unset x i 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_configure %{_mingw32_env} ; \
__mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\

View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 49 Version: 50
Release: 3%{?dist} Release: 3%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
@ -22,6 +22,7 @@ Source7: mingw32-rpmlint.config
Requires: setup Requires: setup
Requires: rpm Requires: rpm
Requires: pkgconfig
Requires: rpmlint >= 0.85-2 Requires: rpmlint >= 0.85-2
BuildRequires: 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} mkdir -p $RPM_BUILD_ROOT%{_bindir}
pushd $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 ln -s %{_libexecdir}/mingw32-scripts $i
done done
popd popd
@ -150,12 +151,19 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config
%{_bindir}/mingw32-configure %{_bindir}/mingw32-configure
%{_bindir}/mingw32-make %{_bindir}/mingw32-make
%{_bindir}/mingw32-pkg-config
%{_libexecdir}/mingw32-scripts %{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/ %{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-* /usr/lib/rpm/mingw32-*
%changelog %changelog
* Fri Mar 27 2009 Richard W.M. Jones <rjones@redhat.com> - 50-3
- Fix up and test mingw32-pkg-config changes.
* Thu Mar 26 2009 Levente Farkas <lfarkas@lfarkas.org> - 50-1
- Add mingw32-pkg-config.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 49-3 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 49-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild