diff options
| author | Pau Ruiz Safont | 2023-02-21 14:43:24 +0000 |
|---|---|---|
| committer | Pau Ruiz Safont | 2023-02-21 14:43:24 +0000 |
| commit | d1fc5203d83bc3d849ea34fdff2265292919ac86 (patch) | |
| tree | 43100c7be661bcaf3302842f63cebfe4d56998b6 | |
| parent | ab13ca01e8dabfb09bbb534916fea2e012a17035 (diff) | |
| download | aur-d1fc5203d83bc3d849ea34fdff2265292919ac86.tar.gz | |
Fix conflict definition and doc location
Issues reported by dreieck
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
2 files changed, 8 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = yanone-kaffeesatz-font pkgdesc = Reminiscent of 1920s coffee house typography, bridges the gap to present times pkgver = 2.001 - pkgrel = 2 + pkgrel = 3 url = https://www.yanone.de/fonts/kaffeesatz arch = any license = OFL @@ -24,6 +24,7 @@ pkgname = otf-yanone-kaffeesatz-infinality groups = infinality-bundle-fonts-extra depends = otf-yanone-kaffeesatz provides = otf-yanone-kaffeesatz-ibx + conflicts = ttf-yanone-kaffeesatz-infinality replaces = otf-yanone-kaffeesatz-ibx pkgname = ttf-yanone-kaffeesatz @@ -36,5 +37,5 @@ pkgname = ttf-yanone-kaffeesatz-infinality groups = infinality-bundle-fonts-extra depends = ttf-yanone-kaffeesatz provides = ttf-yanone-kaffeesatz-ibx + conflicts = otf-yanone-kaffeesatz-infinality replaces = ttf-yanone-kaffeesatz-ibx - @@ -7,7 +7,7 @@ pkgbase=$_font-font pkgname=(otf-$_font{,-infinality} ttf-$_font{,-infinality}) pkgver=2.001 _sha=342dc8badffc187b2116099c5060e46c81eaf80d -pkgrel=2 +pkgrel=3 pkgdesc='Reminiscent of 1920s coffee house typography, bridges the gap to present times' url='https://www.yanone.de/fonts/kaffeesatz' arch=('any') @@ -28,7 +28,7 @@ package_otf-yanone-kaffeesatz() { cd "$_font-$_sha" install -Dm644 -t "$pkgdir/usr/share/fonts/OTF/" fonts/otf/*.otf install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" OFL.txt CONTRIBUTORS.txt - install -Dm644 -t "$pkgdir/usr/share/docs/$pkgname/" AUTHORS.txt README.md + install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" AUTHORS.txt README.md } package_ttf-yanone-kaffeesatz() { @@ -38,13 +38,13 @@ package_ttf-yanone-kaffeesatz() { cd "$_font-$_sha" install -Dm644 -t "$pkgdir/usr/share/fonts/TTF/" fonts/ttf/*.ttf install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" OFL.txt CONTRIBUTORS.txt - install -Dm644 -t "$pkgdir/usr/share/docs/$pkgname/" AUTHORS.txt README.md + install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" AUTHORS.txt README.md } package_otf-yanone-kaffeesatz-infinality() { provides=("otf-$_font-ibx") replaces=("otf-$_font-ibx") - confilts=("ttf-$_font-infinality") + conflicts=("ttf-$_font-infinality") groups=('infinality-bundle-fonts-extra') pkgdesc+=' (OTF infinality configuration files)' depends=("${pkgname%-infinality}") @@ -57,7 +57,7 @@ package_otf-yanone-kaffeesatz-infinality() { package_ttf-yanone-kaffeesatz-infinality() { provides=("ttf-$_font-ibx") replaces=("ttf-$_font-ibx") - confilts=("otf-$_font-infinality") + conflicts=("otf-$_font-infinality") groups=('infinality-bundle-fonts-extra') pkgdesc+=' (TTF infinality configuration files)' depends=("${pkgname%-infinality}") |