From 3763861fb11ff688c81491b3d1c258c4a8dac07b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Dec 2014 13:30:39 +0900 Subject: [PATCH] only define %fname when not overriding the font name prevents rpmbuild warnings: "warning: Macro %fname defined but not used within scope" --- google-noto-fonts.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index 2267180..a351ae2 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -156,7 +156,7 @@ Common files for Google Noto fonts. # -o adds an obsoletes for an older package name %define notopkg(ca:o:)\ %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}\ %package -n %{subpkg}-fonts\ Summary: %{*} font\ @@ -180,10 +180,10 @@ fi\ \ %files -n %{subpkg}-fonts \ %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\ %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