Build against libxml2 instead of expat.

This commit is contained in:
Akira TAGOH 2020-04-02 13:20:49 +09:00
parent 212a960242
commit b1ff33d3af

View File

@ -5,7 +5,7 @@
Summary: Font configuration and customization library
Name: fontconfig
Version: 2.13.92
Release: 9%{?dist}
Release: 10%{?dist}
# src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code
# fc-case/CaseFolding.txt is in the UCD
@ -31,7 +31,7 @@ Patch9: %{name}-fix-assertion.patch
Patch10: %{name}-fix-dtd.patch
Patch11: %{name}-fix-dtd-id.patch
BuildRequires: expat-devel
BuildRequires: libxml2-devel
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: fontpackages-devel
BuildRequires: autoconf automake libtool gettext
@ -40,8 +40,8 @@ BuildRequires: gperf
Requires: fonts-filesystem freetype
# Register DTD system-wide to make validation work by default
# (used by fonts-rpm-macros)
Requires(pre): xml-common libxml2
Requires(postun): xml-common libxml2
Requires(pre): xml-common
Requires(postun): xml-common
PreReq: freetype >= 2.9.1-6
Requires(post): grep coreutils
Requires: font(:lang=en)
@ -85,6 +85,7 @@ export HASDOCBOOK=no
autoreconf
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
--enable-libxml2 \
--disable-static --with-cache-dir=/usr/lib/fontconfig/cache
make %{?_smp_mflags}
@ -188,6 +189,9 @@ fi
%doc fontconfig-devel.txt fontconfig-devel
%changelog
* Thu Apr 02 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-10
- Build against libxml2 instead of expat.
* Sat Mar 28 2020 Nicolas Mailhot <nim@fedoraproject.org> - 2.13.92-9
- Fix DTD declaration and registration so users and Fedora automation can
easily validate new configuration files