Update to 2.11.0
This commit is contained in:
parent
e2634ed884
commit
332b9f4750
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
14
fontconfig-disable-migration-testcase-on-win32.patch
Normal file
14
fontconfig-disable-migration-testcase-on-win32.patch
Normal 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
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user