summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennard Hofmann2020-09-24 15:32:00 +0200
committerLennard Hofmann2020-09-24 15:32:00 +0200
commit2031b47f9a4d27e18e368f5aad14b209feb7d4c8 (patch)
tree57984b135c6500e18ab4710e405096db58e8c517
parent8ed86a912e2907c130637d9edc3d5083a7c588bb (diff)
downloadaur-2031b47f9a4d27e18e368f5aad14b209feb7d4c8.tar.gz
Remove conflict between OTF and TTF
caleb asked for this
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d72c71db5ef..cfec3801b62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,15 +6,13 @@ pkgbase = commissioner-font
arch = any
license = OFL
source = https://github.com/kosbarts/Commissioner/archive/d76954316c5802e590e42acad3eebc8df84c49d8/commissioner-font-1.000-5.zip
- sha512sums = f9961c5c042d3f261f28101a7cfcfcef9bd759d0bd46860a4201b411943840f5f2ec1feda951d81709c78576a5bdc79572c75dde1f267f8af10f7d0633937736
+ sha512sums = 182fa3aadf086c37187511f3acb4d59610884dd53d8ff8bf0eb6c473b3e5570dc15b3fa288db14288714b2efdcee9549c20331252950a295b321d7a21cfeb9c6
pkgname = otf-commissioner
pkgdesc = Sans typeface by Kostas Bartsokas (54 static cuts)
- conflicts = ttf-commissioner
pkgname = ttf-commissioner
pkgdesc = Sans typeface by Kostas Bartsokas (54 static cuts)
- conflicts = otf-commissioner
pkgname = ttf-commissioner-variable
pkgdesc = Sans typeface by Kostas Bartsokas (variable version)
diff --git a/PKGBUILD b/PKGBUILD
index 95ca4fd008a..cc3454cdf3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,6 @@ sha512sums=('182fa3aadf086c37187511f3acb4d59610884dd53d8ff8bf0eb6c473b3e5570dc15
package_otf-commissioner() {
pkgdesc+=' (54 static cuts)'
- conflicts=(ttf-commissioner)
cd "$_reponame-$_commit"
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" OFL.txt
install -Dm644 -t "$pkgdir/usr/share/fonts/commissioner" fonts/static/otfs/*.otf
@@ -22,7 +21,6 @@ package_otf-commissioner() {
package_ttf-commissioner() {
pkgdesc+=' (54 static cuts)'
- conflicts=(otf-commissioner)
cd "$_reponame-$_commit"
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" OFL.txt
install -Dm644 -t "$pkgdir/usr/share/fonts/commissioner" fonts/static/ttfs/*.ttf