diff --git a/fontconfig.spec b/fontconfig.spec index 7235dcc..8ba86a7 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.12.1 -Release: 3%{?dist} +Release: 4%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD @@ -72,7 +72,7 @@ export HASDOCBOOK=no autoreconf %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} @@ -97,7 +97,9 @@ make check 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 # 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. %config %{_fontconfig_masterdir}/fonts.conf %config(noreplace) %{_fontconfig_confdir}/*.conf -%dir %{_localstatedir}/cache/fontconfig +%dir /usr/lib/fontconfig/cache %{_mandir}/man1/* %{_mandir}/man5/* @@ -149,6 +151,9 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* Thu Feb 23 2017 Akira TAGOH - 2.12.1-4 +- Move the cache files into /usr/lib/fontconfig/cache (#1377367, #1416380) + * Wed Feb 22 2017 Akira TAGOH - 2.12.1-3 - Fix FTBFS (#1423570)