!3 fonts-rpm-macros : change the spec template dir

Merge pull request !3 from orange-snn/master
This commit is contained in:
openeuler-ci-bot 2020-04-14 14:11:45 +08:00 committed by Gitee
commit 80dcd47270

View File

@ -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 <songnannan2@huawei.com> - 2.0.2-3
- change the spec template dir
* Wed Mar 4 2020 songnannan <songnannan2@huawei.com> - 2.0.2-2
- bugfix about macros