Mark conflicts with older non-meta ttf-sil-fonts package to ease upgrades

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b96d1fd4f412..c0338f2d5a69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = ttf-sil-apparatus
 	pkgdesc = Symbols used for Biblical text apparatus
 	pkgver = 1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://scripts.sil.org/ApparatusSIL
 	arch = any
-	license = custom:OFL
+	license = OFL
+	conflicts = ttf-sil-fonts<=6
 	source = ApparatusSIL-1.0.zip::https://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=AppSIL1.0.zip&filename=ApparatusSIL.zip
 	sha256sums = 0d8e3143b9c46c97916ab2cf85ae2187fe33b9b40859567a5524266dd58581bc
 
diff --git a/PKGBUILD b/PKGBUILD
index cc5213914fda..177c7210c203 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@ pkgname=ttf-sil-$_pkgname
 _fname=${_pkgname^}SIL
 _pname=AppSIL
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Symbols used for Biblical text apparatus'
 arch=('any')
 url="https://scripts.sil.org/$_fname"
-license=('custom:OFL')
+license=('OFL')
+conflicts=('ttf-sil-fonts<=6')
 source=("$_fname-$pkgver.zip::https://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=$_pname$pkgver.zip&filename=$_fname.zip")
 sha256sums=('0d8e3143b9c46c97916ab2cf85ae2187fe33b9b40859567a5524266dd58581bc')