Update to 2.11.0

This commit is contained in:
Erik van Pienbroek 2013-11-20 20:36:47 +01:00
parent e2634ed884
commit 332b9f4750
4 changed files with 29 additions and 3 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
45c5ba47be70577faa05c3aaf2b6a7e1 fontconfig-2.10.95.tar.bz2
000bd4baf7aefa828e03414d0c8c7dc5 fontconfig-2.11.0.tar.bz2