From f34fae2303c80c86715d7d78cc77a5bab444c268 Mon Sep 17 00:00:00 2001 From: David Kaspar [Dee'Kej] Date: Dec 16 2017 06:11:22 +0000 Subject: *-devel subpackage created This subpackage provides %{urw_base35_fontpath} macro, which is useful for many packages that are built against these fonts. --- diff --git a/urw-base35-fonts.spec b/urw-base35-fonts.spec index 7e8e565..d42bfa2 100644 --- a/urw-base35-fonts.spec +++ b/urw-base35-fonts.spec @@ -180,7 +180,7 @@ by (URW)++ company, and are mainly utilized by applications using Ghostscript. Name: %{fontname}-fonts Summary: Core Font Set containing 35 freely distributable fonts from (URW)++ Version: 20170801 -Release: 2%{?dist} +Release: 3%{?dist} # NOTE: (URW)++ holds the copyright, but Artifex Software has obtained rights to # release these fonts under GNU Affero General Public License (version 3). @@ -288,6 +288,19 @@ Requires: fontpackages-filesystem This package contains the necessary license files for this font set. +# --------------- + +%package devel +Summary: RPM macros related to (URW)++ Level 2 Core Font Set +Requires: %{name} = %{version}-%{release} + +%description devel +%{common_desc} + +This package is useful for Fedora development purposes only. It installs RPM +macros useful for building packages against %{name}, +as well as all the fonts contained in this font set. + # ============================================================================= # NOTE: When making an update, make sure to check if any font families were # added/removed. We always need to pack all the fonts into subpackages. @@ -343,6 +356,13 @@ touch %{buildroot}%{_fontdir}/fonts.scale install -m 0755 -d %{buildroot}%{_sysconfdir}/X11/fontpath.d ln -sf %{_fontdir} %{buildroot}%{_sysconfdir}/X11/fontpath.d/%{name} +# Generate the macro containing the path to our fonts: +install -m 0755 -d %{buildroot}%{_rpmconfigdir}/macros.d + +cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name} << _EOF +%%urw_base35_fontpath %{_fontdir} +_EOF + # NOTE: There's no reason to run 'post' and 'postun' scriptlets for the main # metapackage or the *-common subpackage. Everything necessary is handled # by any of the actual font family subpackages. @@ -365,9 +385,15 @@ ln -sf %{_fontdir} %{buildroot}%{_sysconfdir}/X11/fontpath.d/%{name} %{_sysconfdir}/fonts/conf.d/%{fontconfig_prio}-urw-fallback-backwards.conf %{_sysconfdir}/X11/fontpath.d/%{name} +%files devel +%{_rpmconfigdir}/macros.d/macros.%{name} + # ============================================================================= %changelog +* Wed Dec 13 2017 David Kaspar [Dee'Kej] 20170801-3 +- *-devel subpackage added + * Mon Sep 25 2017 David Kaspar [Dee'Kej] - 20170801-2 - urw-base35-fonts-20170801-000-split-urw-fallback.patch added - decrease the fontconfig priority/ordering value to 60 (bug #1494850)