use %_font_pkg

seems to work inside macro now correctly with current rpm
This commit is contained in:
Jens Petersen 2017-12-11 15:47:30 +09:00
parent bb84b10e4f
commit f543deb577

View File

@ -10,7 +10,7 @@ in Unicode.\
Name: %{fontname}-fonts Name: %{fontname}-fonts
Version: 20161022 Version: 20161022
Release: 4%{?dist} Release: 5%{?dist}
Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts
Group: User Interface/X Group: User Interface/X
License: OFL License: OFL
@ -187,12 +187,7 @@ if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \
%{_bindir}/fc-cache %{_fontdir} || : \ %{_bindir}/fc-cache %{_fontdir} || : \
fi\ fi\
\ \
%files -n %{subpkg}-fonts \ %_font_pkg -n %{pname} -f %{fconf} Noto%{-a*}%{!-a:%{fname}}*.*t%{-c:c}%{!-c:f}\
%dir %{_fontdir} \
%{_fontdir}/Noto%{-a*}%{!-a:%{fname}}-*.*t%{-c:c}%{!-c:f}\
%{_fontconfig_templatedir}/%{fconf}\
%config(noreplace) %{_fontconfig_confdir}/%{fconf}\
#%%_font_pkg -n %%{pname} -f %{fconf} Noto%{-a*}%{!-a:%%{fname}}*.*t%{-c:c}%{!-c:f}\
%{_datadir}/appdata/%{subpkg}.metainfo.xml %{_datadir}/appdata/%{subpkg}.metainfo.xml
@ -401,6 +396,9 @@ done
%changelog %changelog
* Mon Dec 11 2017 Jens Petersen <petersen@redhat.com> - 20161022-5
- use _font_pkg
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20161022-4 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20161022-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild