Move the cache files into /usr/lib/fontconfig/cache (#1377367, #1416380)

This commit is contained in:
Akira TAGOH 2017-02-23 23:32:10 +09:00
parent e79992bb04
commit d5e37249ef

View File

@ -3,7 +3,7 @@
Summary: Font configuration and customization library Summary: Font configuration and customization library
Name: fontconfig Name: fontconfig
Version: 2.12.1 Version: 2.12.1
Release: 3%{?dist} Release: 4%{?dist}
# src/ftglue.[ch] is in Public Domain # src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code # src/fccache.c contains Public Domain code
# fc-case/CaseFolding.txt is in the UCD # fc-case/CaseFolding.txt is in the UCD
@ -72,7 +72,7 @@ export HASDOCBOOK=no
autoreconf autoreconf
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \ %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
--disable-static --disable-static --with-cache-dir=/usr/lib/fontconfig/cache
make %{?_smp_mflags} make %{?_smp_mflags}
@ -97,7 +97,9 @@ make check
umask 0022 umask 0022
mkdir -p %{_localstatedir}/cache/fontconfig mkdir -p /usr/lib/fontconfig/cache
[[ -d %{_localstatedir}/cache/fontconfig ]] && rm -rf %{_localstatedir}/cache/fontconfig/* 2> /dev/null || :
# Force regeneration of all fontconfig cache files # Force regeneration of all fontconfig cache files
# The check for existance is needed on dual-arch installs (the second # The check for existance is needed on dual-arch installs (the second
@ -135,7 +137,7 @@ HOME=/root /usr/bin/fc-cache -s
# If you want to do so, you should use local.conf instead. # If you want to do so, you should use local.conf instead.
%config %{_fontconfig_masterdir}/fonts.conf %config %{_fontconfig_masterdir}/fonts.conf
%config(noreplace) %{_fontconfig_confdir}/*.conf %config(noreplace) %{_fontconfig_confdir}/*.conf
%dir %{_localstatedir}/cache/fontconfig %dir /usr/lib/fontconfig/cache
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
@ -149,6 +151,9 @@ HOME=/root /usr/bin/fc-cache -s
%doc fontconfig-devel.txt fontconfig-devel %doc fontconfig-devel.txt fontconfig-devel
%changelog %changelog
* Thu Feb 23 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.1-4
- Move the cache files into /usr/lib/fontconfig/cache (#1377367, #1416380)
* Wed Feb 22 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.1-3 * Wed Feb 22 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.1-3
- Fix FTBFS (#1423570) - Fix FTBFS (#1423570)