41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 0a54dd74a35db11723834b509b0795dffbdd7ddf Mon Sep 17 00:00:00 2001
|
|
From: orange-snn <songnannan2@huawei.com>
|
|
Date: Wed, 4 Mar 2020 10:09:25 +0800
|
|
Subject: [PATCH] bugfix about macros
|
|
|
|
---
|
|
rpm/macros.d/macros.fonts-srpm | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/rpm/macros.d/macros.fonts-srpm b/rpm/macros.d/macros.fonts-srpm
|
|
index 77365d6..b7385fb 100644
|
|
--- a/rpm/macros.d/macros.fonts-srpm
|
|
+++ b/rpm/macros.d/macros.fonts-srpm
|
|
@@ -20,19 +20,19 @@
|
|
## Default directories
|
|
|
|
# Font installation directory root
|
|
-%_fontbasedir @@_FONTBASEDIR@@
|
|
+%_fontbasedir %{_datadir}/fonts
|
|
|
|
# Master fontconfig configuration directory
|
|
# Only needed to avoid a circular directory dependency with the fontconfig
|
|
# package — you should *not* use this in fonts packages
|
|
-%_fontconfig_masterdir @@_FONTCONFIG_MASTERDIR@@
|
|
+%_fontconfig_masterdir %{_sysconfdir}/fonts
|
|
|
|
# Fontconfig directory for active configuration snippets
|
|
-%_fontconfig_confdir @@_FONTCONFIG_CONFDIR@@
|
|
+%_fontconfig_confdir %{_sysconfdir}/fonts/conf.d
|
|
|
|
# Fontconfig configuration template directory
|
|
# Templates are activated by symlinking in _fontconfig_confdir
|
|
-%_fontconfig_templatedir @@_FONTCONFIG_TEMPLATEDIR@@
|
|
+%_fontconfig_templatedir %{_datadir}/fontconfig/conf.avail
|
|
|
|
# Default contact in font appstream files
|
|
# Override in your spec file if it does not apply
|
|
--
|
|
1.8.3.1
|
|
|