From 332b9f475053aba063d99c5aa1fc8a7486e95131 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Wed, 20 Nov 2013 20:36:47 +0100
Subject: [PATCH] Update to 2.11.0

---
 .gitignore                                        |  1 +
 ...nfig-disable-migration-testcase-on-win32.patch | 14 ++++++++++++++
 mingw-fontconfig.spec                             | 15 +++++++++++++--
 sources                                           |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 fontconfig-disable-migration-testcase-on-win32.patch

diff --git a/.gitignore b/.gitignore
index c79e895..8b782ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ fontconfig-2.6.0.tar.gz
 /fontconfig-2.10.92.tar.bz2
 /fontconfig-2.10.93.tar.bz2
 /fontconfig-2.10.95.tar.bz2
+/fontconfig-2.11.0.tar.bz2
diff --git a/fontconfig-disable-migration-testcase-on-win32.patch b/fontconfig-disable-migration-testcase-on-win32.patch
new file mode 100644
index 0000000..a3cc475
--- /dev/null
+++ b/fontconfig-disable-migration-testcase-on-win32.patch
@@ -0,0 +1,14 @@
+--- fontconfig-2.11.0/test/Makefile.am.orig	2013-11-20 20:30:45.629512069 +0100
++++ fontconfig-2.11.0/test/Makefile.am	2013-11-20 20:33:57.925375777 +0100
+@@ -16,7 +16,10 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ 
+-check_PROGRAMS = test-migration
++check_PROGRAMS = 
++if !OS_WIN32
++check_PROGRAMS += test-migration
++endif
+ if HAVE_PTHREAD
+ check_PROGRAMS += test-pthread
+ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
diff --git a/mingw-fontconfig.spec b/mingw-fontconfig.spec
index ceda1f7..52cf5ee 100644
--- a/mingw-fontconfig.spec
+++ b/mingw-fontconfig.spec
@@ -1,7 +1,7 @@
 %{?mingw_package_header}
 
 Name:           mingw-fontconfig
-Version:        2.10.95
+Version:        2.11.0
 Release:        1%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
@@ -28,6 +28,13 @@ BuildRequires:  mingw64-win-iconv
 
 BuildRequires:  pkgconfig
 
+# Needed for the patch
+BuildRequires:  autoconf automake libtool
+
+# The testcase called 'migration' relies too much on UNIX features
+# like chmod, so disable the testcase when cross-compiling for win32
+Patch0:         fontconfig-disable-migration-testcase-on-win32.patch
+
 
 %description
 MinGW Windows Fontconfig library.
@@ -69,7 +76,8 @@ Static version of the cross compiled Fontconfig library.
 
 %prep
 %setup -q -n fontconfig-%{version}
-
+%patch0 -p1
+autoreconf -i --force
 
 %build
 export MINGW32_CONFIGURE_ARGS="--with-arch=i686"
@@ -147,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc
 
 
 %changelog
+* Wed Nov 20 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.11.0-1
+- Update to 2.11.0
+
 * Sat Sep  7 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.10.95-1
 - Update to 2.10.95
 
diff --git a/sources b/sources
index 1682fa9..665ece6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45c5ba47be70577faa05c3aaf2b6a7e1  fontconfig-2.10.95.tar.bz2
+000bd4baf7aefa828e03414d0c8c7dc5  fontconfig-2.11.0.tar.bz2