diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec index 17698d8aa3..3f547fbc7b 100644 --- a/anda/fonts/nerd-fonts/nerd-fonts.spec +++ b/anda/fonts/nerd-fonts/nerd-fonts.spec @@ -3,18 +3,18 @@ Name: nerd-fonts Version: 3.0.1 -Release: 1%{?dist} +Release: 1%?dist URL: https://nerdfonts.com/ -Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/readme.md -Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/LICENSE +Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md +Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/LICENSE License: OFL-1.1 Summary: All packaged Nerd fonts BuildArch: noarch -Requires: %{lua: +Recommends: %{lua: local x = "" -local ver = rpm.expand("%{version}") -for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do - x = x .. font:lower().."-nerd-fonts="..ver.." " +local ver = rpm.expand("%version-%release") +for font in (rpm.expand("%flist")):gmatch("[^ ]+") do + x = x .. font:lower().."-nerd-fonts = "..ver.." " end print(x) } @@ -22,7 +22,7 @@ BuildRequires: unzip %{lua: local url = rpm.expand(": https://github.com/ryanoasis/nerd-fonts/releases/download/v%{version}/"); local n = 2; -for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do +for font in (rpm.expand("%flist")):gmatch("[^ ]+") do print("Source"..n..url..font..".zip\n") n = n + 1 end @@ -33,7 +33,7 @@ end 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others. %{lua: -for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do +for font in (rpm.expand("%flist")):gmatch("[^ ]+") do print("%package -n "..font:lower().."-nerd-fonts\n") print("Summary:\tPatched Nerd fonts: "..font) print("\n%description -n "..font:lower().."-nerd-fonts\n") @@ -41,30 +41,30 @@ for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do end } -%global debug_package %{nil} +%global debug_package %nil %prep -cp %{SOURCE0} . -cp %{SOURCE1} . +cp %SOURCE0 . +cp %SOURCE1 . %build %install -mkdir -p %{buildroot}/usr/share/fonts/nerd-fonts/ +mkdir -p %buildroot/usr/share/fonts/nerd-fonts/ %{lua: -local dest = rpm.expand("%{buildroot}/usr/share/fonts/nerd-fonts/"); +local dest = rpm.expand("%buildroot/usr/share/fonts/nerd-fonts/"); local n = 2; -for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do - local src = rpm.expand("%{SOURCE"..n.."}") +for font in (rpm.expand("%flist")):gmatch("[^ ]+") do + local src = rpm.expand("%SOURCE"..n) print("unzip "..src.." -d "..dest..font.." &\n") n = n + 1 end } wait -find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "* Windows Compatible.*" -delete & -find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "*.txt" -delete & -find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "readme.md" -delete & +find %buildroot/usr/share/fonts/nerd-fonts/ -name "* Windows Compatible.*" -delete & +find %buildroot/usr/share/fonts/nerd-fonts/ -name "*.txt" -delete & +find %buildroot/usr/share/fonts/nerd-fonts/ -name "readme.md" -delete & wait @@ -73,7 +73,7 @@ wait %license LICENSE %{lua: -for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do +for font in (rpm.expand("%flist")):gmatch("[^ ]+") do print("%files -n "..font:lower().."-nerd-fonts\n") print("%doc readme.md\n") print("%license LICENSE\n")