X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fontconfig%2Fmingw-fontconfig.spec;h=350c4586f1e05cabc04ce680464c88a168de20b7;hb=98ffdda59a136fb65c81ebb9fc0b5f045db5acf4;hp=77f75aef190d55f8968ac8f560bea285ba7c8b16;hpb=f851b14216127f995b159c3d31586362a2c16300;p=fedora-mingw.git

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index 77f75ae..350c458 100644
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -1,8 +1,12 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-fontconfig
 Version:        2.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
 License:        MIT
@@ -13,10 +17,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-freetype
+BuildRequires:  mingw-libxml2
+BuildRequires:  pkgconfig
 
 %description
 MinGW Windows Fontconfig library.
@@ -26,6 +32,7 @@ MinGW Windows Fontconfig library.
 %setup -q -n fontconfig-%{version}
 
 %build
+PATH="%{_mingw_bindir}:$PATH" \
 %{_mingw_configure} --with-arch=i686
 make
 
@@ -66,8 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_datadir}/doc/fontconfig
 
 %changelog
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-3
+- Add mingw_bindir to $PATH for freetype-config script
+
 * Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-2
 - Remove static library.
+- +BR mingw-libxml2.
 
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-1
 - Initial RPM release