rpms/google-noto-fonts
7
0
Fork 0
Code Issues Pull Requests Releases Activity

only define %fname when not overriding the font name

Browse Source 
prevents rpmbuild warnings:
"warning: Macro %fname defined but not used within scope"
This commit is contained in:
Jens Petersen 2014-12-24 13:30:39 +09:00
parent 362d8304b8
commit 3763861fb1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
google-noto-fonts.spec
View File

@ -156,7 +156,7 @@ Common files for Google Noto fonts.
# -o adds an obsoletes for an older package name # -o adds an obsoletes for an older package name
%define notopkg(ca:o:)\ %define notopkg(ca:o:)\
%define pname %(echo %{*} | tr "A-Z " "a-z-")\ %define pname %(echo %{*} | tr "A-Z " "a-z-")\
%define fname %(echo %{*} | sed -e "s/ //g")\ %{!-a:%define fname %(echo %{*} | sed -e "s/ //g")}\
%define subpkg %{fontname}-%{pname}\ %define subpkg %{fontname}-%{pname}\
%package -n %{subpkg}-fonts\ %package -n %{subpkg}-fonts\
Summary: %{*} font\ Summary: %{*} font\
@ -180,10 +180,10 @@ fi\
\ \
%files -n %{subpkg}-fonts \ %files -n %{subpkg}-fonts \
%dir %{_fontdir} \ %dir %{_fontdir} \
%{_fontdir}/Noto%{-a*}%{!-a:%fname}-*.*t%{-c:c}%{!-c:f}\ %{_fontdir}/Noto%{-a*}%{!-a:%{fname}}-*.*t%{-c:c}%{!-c:f}\
%{_fontconfig_templatedir}/%{fontconf}-%{pname}.conf\ %{_fontconfig_templatedir}/%{fontconf}-%{pname}.conf\
%config(noreplace) %{_fontconfig_confdir}/%{fontconf}-%{pname}.conf\ %config(noreplace) %{_fontconfig_confdir}/%{fontconf}-%{pname}.conf\
#%%_font_pkg -n %{pname} -f %{fontconf}-%{pname}.conf Noto%{-a*}%{!-a:%fname}*.*t%{-c:c}%{!-c:f}\ #%%_font_pkg -n %{pname} -f %{fontconf}-%{pname}.conf Noto%{-a*}%{!-a:%{fname}}*.*t%{-c:c}%{!-c:f}\
%{_datadir}/appdata/%{subpkg}.metainfo.xml %{_datadir}/appdata/%{subpkg}.metainfo.xml