New patches from Fedora.

[fedora-mingw.git] / fontconfig / mingw32-fontconfig.spec

diff --git a/fontconfig/mingw32-fontconfig.spec b/fontconfig/mingw32-fontconfig.spec
index 372d6f1..8e3b118 100644 (file)
--- a/fontconfig/mingw32-fontconfig.spec
+++ b/fontconfig/mingw32-fontconfig.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-fontconfig
 Version:        2.6.0
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
 License:        MIT
@@ -19,14 +19,19 @@ Patch0:         mingw32-fontconfig-2.6.0-remove-logfile.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-dlfcn
+BuildRequires:  mingw32-expat
 BuildRequires:  mingw32-freetype
+BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-libxml2
 BuildRequires:  pkgconfig
 BuildRequires:  docbook-utils
-BuildRequires:  autoconf automake libtool
+BuildRequires:  automake, autoconf, libtool
+
+Requires:       pkgconfig
 
 
 %description
@@ -36,13 +41,14 @@ MinGW Windows Fontconfig library.
 %prep
 %setup -q -n fontconfig-%{version}
 %patch0 -p1
+libtoolize --force --copy
 autoreconf
 
 
 %build
 PATH="%{_mingw32_bindir}:$PATH" \
 %{_mingw32_configure} --with-arch=i686
-make
+make %{?_smp_mflags}
 
 
 %install
@@ -65,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc COPYING
 %{_mingw32_bindir}/fc-cache.exe
 %{_mingw32_bindir}/fc-cat.exe
 %{_mingw32_bindir}/fc-list.exe
@@ -79,6 +86,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/doc/fontconfig
 
 %changelog
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-9
+- Rebuild for mingw32-gcc 4.4
+
+* Fri Feb  6 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-8
+- Include license.
+
+* Fri Jan 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-7
+- Requires pkgconfig.
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-6
+- Use _smp_mflags.
+- Rebuild libtool configuration.
+- More BRs suggested by auto-buildrequires.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-5
 - Rename mingw -> mingw32.