bugfix about macros

README.en.md

@@ -1,36 +0,0 @@
-# fonts-rpm-macros
-
-#### Description
-help font packages to produce clean,consistent and sane packages
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# fonts-rpm-macros
-
-#### 介绍
-help font packages to produce clean,consistent and sane packages
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

bugfix-fonts-rpm-macros-macros.patch

@@ -0,0 +1,40 @@
+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
+

fonts-rpm-macros.spec

@@ -9,7 +9,7 @@
 
 Name:      fonts-rpm-macros
 Version:   2.0.2
-Release:   1
+Release:   2
 Summary:   Build-stage rpm automation for fonts packages
 License:   GPLv3+
 URL:       https://docs.fedoraproject.org/en-US/packaging-guidelines/FontsPolicy/
@@ -21,7 +21,9 @@ Requires:  fonts-filesystem  = %{version}-%{release}
 Provides:  fontpackages-devel = %{version}-%{release}
 Obsoletes: fontpackages-devel < %{version}-%{release}
 Obsoletes: fontpackages-tools < %{version}-%{release}
-Requires:  fontconfig libappstream-glib uchardet python3-ruamel-yaml python3-lxml
+Requires:  fontconfig libappstream-glib uchardet python3-ruamel-yaml python3-lxml fonts-srpm-macros
+
+Patch0001: bugfix-fonts-rpm-macros-macros.patch
 
 %description
 This package provides build-stage rpm automation to simplify the creation of
@@ -123,5 +125,8 @@ install -m 0755 -vp   bin/* %{buildroot}%{_bindir}
 %doc %{ftcgtemplatedir}/*conf 
 
 %changelog
+* Wed Mar 4 2020 songnannan <songnannan2@huawei.com> - 2.0.2-2
+- bugfix about macros
+
 * Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.2-1
 - Package init