summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGI_Jack2020-03-23 10:31:00 -0400
committerGI_Jack2020-03-23 10:31:00 -0400
commitddc4a64550fc3afbe4ae27be41474af3b578b66a (patch)
tree93c85d1b08b17707f9b4e2e095ab886257f0e2ea
parentfd5589cf8237cc184641583a8a5871dc8b9493c8 (diff)
downloadaur-ddc4a64550fc3afbe4ae27be41474af3b578b66a.tar.gz
fixed conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b81a003b8aab..c81e20b04e7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,11 +5,11 @@ pkgbase = ferrite-core
url = https://github.com/froyotam/ferrite-core/
arch = any
license = Custom
- conflicts = ttf-ferrite-core-git
source = otf-ferrite-core-2.0.tar.gz::https://github.com/froyotam/ferrite-core/archive/2.0.tar.gz
sha256sums = 3ecd9c181e746bd2b92c5fc429cfb0a3a61456637ab5a5d6d4d46dd0ca96c7ba
pkgname = otf-ferrite-core
pkgname = ttf-ferrite-core
+ conflicts = ttf-ferrite-core-git
diff --git a/PKGBUILD b/PKGBUILD
index 332ea1a80767..4f3fc9ac7fb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,13 @@ pkgdesc="Ferrite Core DX font family by Froyo Tam(Meta-package with TTF and OTF
arch=('any')
url="https://github.com/froyotam/ferrite-core/"
license=('Custom')
-conflicts=("ttf-ferrite-core-git")
install=
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/froyotam/ferrite-core/archive/${pkgver}.tar.gz")
noextract=()
sha256sums=('3ecd9c181e746bd2b92c5fc429cfb0a3a61456637ab5a5d6d4d46dd0ca96c7ba')
package_ttf-ferrite-core() {
+ conflicts=("ttf-ferrite-core-git")
cd "${_pkgname}-${pkgver}"
install -Dm644 OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 fonts/ttf/FerriteCore-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/FerriteCore-Regular.ttf"