fc25: Add initial support for Fedora 25

Makefile

@@ -1,4 +1,4 @@
-BASE = fedora-24
+BASE = fedora-25
 DIRS = $(wildcard */)
 
 define makerpm =

fontconfig-infinality-ultimate/04-Makefile.conf.d.patch

@@ -9,14 +9,15 @@
  DATA = $(config_DATA) $(template_DATA)
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
  am__DIST_COMMON = $(srcdir)/Makefile.in README
-@@ -343,25 +343,8 @@ target_alias = @target_alias@
+@@ -343,26 +343,8 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -BUILT_SOURCES = README
 -DOC_SOURCES = README.in
  DOC_FILES = $(DOC_SOURCES:.in=)
 -CONF_LINKS = \
+-	10-hinting-$(PREFERRED_HINTING).conf	\
 -	10-scale-bitmap-fonts.conf \
 -	20-unhint-small-vera.conf \
 -	30-urw-aliases.conf \

fontconfig-infinality-ultimate/fontconfig-infinality-ultimate.spec

@@ -2,8 +2,8 @@
 
 Summary:	Font configuration and customization library
 Name:		fontconfig-infinality-ultimate
-Version:	2.11.94
-Release:	5%{?dist}
+Version:	2.12.1
+Release:	1%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 # fc-case/CaseFolding.txt is in the UCD
@@ -17,13 +17,11 @@ Source2:	presets.tar.bz2
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=140335
 Patch0:		fontconfig-sleep-less.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1236034
-Patch1:		fontconfig-lock-cache.patch
-Patch3: 	01-configure.patch
-Patch4: 	02-configure.ac.patch
-Patch5: 	03-Makefile.in.patch
-Patch6: 	04-Makefile.conf.d.patch
-Patch7: 	05-Makefile.am.in.patch
+Patch2: 	01-configure.patch
+Patch3: 	02-configure.ac.patch
+Patch4: 	03-Makefile.in.patch
+Patch5: 	04-Makefile.conf.d.patch
+Patch6: 	05-Makefile.am.in.patch
 
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= %{freetype_version}
@@ -77,12 +75,11 @@ which is useful for developing applications that uses fontconfig.
 cd ..
 %setup -q -a 1 -n fontconfig-%{version}
 %patch0 -p1 -b .sleep-less
-%patch1 -p1 -b .lock-cache
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 aclocal
 libtoolize -f

freetype-infinality-ultimate/0001-Enable-table-validation-modules.patch

@@ -0,0 +1,34 @@
+From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index d677565a2bc2b5a2..f19cbec33384a86f 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
+ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
+
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+-- 
+2.9.0
+