From 41388b324c1a507e7b1b13a887df8207cd20298c Mon Sep 17 00:00:00 2001 From: songnannan Date: Thu, 9 Apr 2020 22:03:22 +0800 Subject: [PATCH] change the spec template dir --- fonts-rpm-macros.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fonts-rpm-macros.spec b/fonts-rpm-macros.spec index 4032d6b..8671109 100644 --- a/fonts-rpm-macros.spec +++ b/fonts-rpm-macros.spec @@ -1,5 +1,5 @@ %forgemeta -%global _spectemplatedir %{_datadir}/rpmdevtools/fedora +%global _spectemplatedir %{_datadir}/rpmdevtools/%{_vendor} %global _docdir_fmt %{name} %global ftcgtemplatedir %{_datadir}/fontconfig/templates %global _fontbasedir %{_datadir}/fonts @@ -9,7 +9,7 @@ Name: fonts-rpm-macros Version: 2.0.2 -Release: 2 +Release: 3 Summary: Build-stage rpm automation for fonts packages License: GPLv3+ URL: https://docs.fedoraproject.org/en-US/packaging-guidelines/FontsPolicy/ @@ -84,10 +84,10 @@ install -m 0755 -vd %{buildroot}%{ftcgtemplatedir} install -m 0644 -vp templates/fontconfig/*{conf,txt} %{buildroot}%{ftcgtemplatedir} install -m 0755 -vd %{buildroot}%{rpmmacrodir} install -m 0644 -vp rpm/macros.d/macros.fonts-* %{buildroot}%{rpmmacrodir} -install -m 0755 -vd %{buildroot}%{_rpmluadir}/fedora/srpm -install -m 0644 -vp rpm/lua/srpm/*lua %{buildroot}%{_rpmluadir}/fedora/srpm -install -m 0755 -vd %{buildroot}%{_rpmluadir}/fedora/rpm -install -m 0644 -vp rpm/lua/rpm/*lua %{buildroot}%{_rpmluadir}/fedora/rpm +install -m 0755 -vd %{buildroot}%{_rpmluadir}/%{_vendor}/srpm +install -m 0644 -vp rpm/lua/srpm/*lua %{buildroot}%{_rpmluadir}/%{_vendor}/srpm +install -m 0755 -vd %{buildroot}%{_rpmluadir}/%{_vendor}/rpm +install -m 0644 -vp rpm/lua/rpm/*lua %{buildroot}%{_rpmluadir}/%{_vendor}/rpm install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp bin/* %{buildroot}%{_bindir} @@ -95,13 +95,13 @@ install -m 0755 -vp bin/* %{buildroot}%{_bindir} %defattr(-,root,root) %license LICENSE.txt %{_bindir}/* -%{_rpmluadir}/fedora/rpm/*.lua +%{_rpmluadir}/%{_vendor}/rpm/*.lua %{rpmmacrodir}/macros.fonts-rpm* %files -n fonts-srpm-macros %defattr(-,root,root) %license LICENSE.txt -%{_rpmluadir}/fedora/srpm/*.lua +%{_rpmluadir}/%{_vendor}/srpm/*.lua %{rpmmacrodir}/macros.fonts-srpm* %files -n fonts-filesystem @@ -125,6 +125,9 @@ install -m 0755 -vp bin/* %{buildroot}%{_bindir} %doc %{ftcgtemplatedir}/*conf %changelog +* Thu Apr 9 2020 songnannan - 2.0.2-3 +- change the spec template dir + * Wed Mar 4 2020 songnannan - 2.0.2-2 - bugfix about macros