From 6edc341bbc7f63fa049fdfdcf3d4575e98b8348a Mon Sep 17 00:00:00 2001 From: David Kaspar [Dee'Kej] Date: Aug 22 2017 16:00:39 +0000 Subject: specfile: fontconfig files added to (sub)packages The priority for fontconfig files were taken from previously used value (30) in Fedora. NOTE: We're not defining BuildRequires for 'coreutils', because this package is installed into mock build-root by default. --- diff --git a/urw-base35-fonts.spec b/urw-base35-fonts.spec index e75fa10..8642915 100644 --- a/urw-base35-fonts.spec +++ b/urw-base35-fonts.spec @@ -107,6 +107,7 @@ # GLOBAL MACROS: # -------------- %global fontname urw-base35 +%global fontconfig_prio 30 %global urw_fonts_vers 3:2.4-25 %global tmpdir %{_localstatedir}/lib/rpm-state/urw-base35-fonts %global tmpfile %{tmpdir}/cache-update-needed @@ -266,6 +267,8 @@ which is part of Level 2 Core Font Set. \ %{_fontdir}/%{ff_filename}*.t1 \ %{_fontdir}/%{ff_filename}*.afm \ %{_datadir}/appdata/de.urwpp.%{orig_filename}.metainfo.xml \ +%{_datadir}/fontconfig/conf.avail/%{fontconfig_prio}-urw-%{subpkg_name}.conf \ +%{_sysconfdir}/fonts/conf.d/%{fontconfig_prio}-urw-%{subpkg_name}.conf \ # ============================================================================= @@ -304,12 +307,21 @@ This package contains the necessary license files for this font set. %install install -m 0755 -d %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_datadir}/appdata +install -m 0755 -d %{buildroot}%{_datadir}/fontconfig/conf.avail +install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d install -m 0644 -p fonts/*.t1 %{buildroot}%{_fontdir} install -m 0644 -p fonts/*.afm %{buildroot}%{_fontdir} install -m 0644 -p appstream/*.metainfo.xml %{buildroot}%{_datadir}/appdata/ +# Install the fontconfig files with correct priority for our distribution: +for file in fontconfig/*.conf; do + DISTRO_FILENAME="%{fontconfig_prio}-urw-$(basename $file)" + install -m 0644 -p $file %{buildroot}%{_datadir}/fontconfig/conf.avail/$DISTRO_FILENAME + ln -sf %{_datadir}/fontconfig/conf.avail/$DISTRO_FILENAME %{buildroot}%{_sysconfdir}/fonts/conf.d/$DISTRO_FILENAME +done + # We need to touch these files -- otherwise running 'rpm --setperms' would # result in these files having incorrect permissions [-------.]: touch %{buildroot}%{_fontdir}/fonts.dir