diff --git a/.gitignore b/.gitignore index ba0ff71..594b411 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Comfortaa___font_by_aajohan.zip /comfortaa___font_by_aajohan-d1qr019.zip /aajohan-comfortaa-fonts-3.101.tar.gz +/comfortaa-2a87ac6.tar.gz diff --git a/61-aajohan-comfortaa-fonts.conf b/61-aajohan-comfortaa-fonts.conf index f7b8cce..5351a2b 100644 --- a/61-aajohan-comfortaa-fonts.conf +++ b/61-aajohan-comfortaa-fonts.conf @@ -1,17 +1,17 @@ - + - - sans-serif - - Comfortaa - - - + + sans-serif + + Comfortaa + + + Comfortaa - sans-serif + sans-serif - + diff --git a/aajohan-comfortaa-fonts.spec b/aajohan-comfortaa-fonts.spec index bfbe096..9d444be 100644 --- a/aajohan-comfortaa-fonts.spec +++ b/aajohan-comfortaa-fonts.spec @@ -1,5 +1,8 @@ -Version: 3.101 -Release: %autorelease +%global commit 2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global date 20210729 +Version: 3.105 +Release: %autorelease %{?shortcommit: -p -s %{date}git%{shortcommit}} URL: https://www.deviantart.com/aajohan %global foundry Aajohan @@ -10,22 +13,28 @@ URL: https://www.deviantart.com/aajohan %global fontfamily Comfortaa %global fontsummary Modern style true type font -%global fonts fonts/OTF/*.otf +%global fonts fonts/OTF/*.otf fonts/otf/*otf %global fontconfs %{SOURCE1} %global fontdescription %{expand: Comfortaa is a sans-serif font comfortable in every aspect with Bold, Regular, and Thin variants. It has very good European language coverage and decent Cyrillic coverage.} -Source0: https://github.com/googlefonts/comfortaa/archive/%{version}%{?prerelease}/%{name}-%{version}%{?prerelease}.tar.gz +%{?shortcommit: +Source0: https://github.com/googlefonts/comfortaa/archive/%{shortcommit}/comfortaa-%{shortcommit}.tar.gz} +%{!?shortcommit: +Source0: https://github.com/googlefonts/comfortaa/archive/%{version}/comfortaa-%{version}.tar.gz} Source1: 61-%{fontpkgname}.conf %fontpkg %prep +%{?shortcommit: +%autosetup -n comfortaa-%{commit} } +%{!?shortcommit: %autosetup -n comfortaa-%{version} -chmod 644 AUTHORS.txt CONTRIBUTORS.txt -%linuxtext FONTLOG.txt OFL.txt +} +%linuxtext OFL.txt %build %fontbuild diff --git a/sources b/sources index 2813a99..e4083f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aajohan-comfortaa-fonts-3.101.tar.gz) = 0411960f72729513c234de753271e311465968ea62975201e1d54125aee16520a065f983b37e588f91cf7e5d0f439e7f1095ea02ea13f94b605b4b72ff626b7f +SHA512 (comfortaa-2a87ac6.tar.gz) = ce442c080d89d527de8a018045e3c54b348a87c4b0015a20423b92797b124a2288f12bab0f3413e10d36857ea7a9ba6b68dc65678db1717d969a7d3e9535d559