Note conflict with -git package

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df7958fb326a..2366da5c920f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jul 31 15:19:36 UTC 2018
+# Tue Jul 31 15:38:48 UTC 2018
 pkgbase = afdko
 	pkgdesc = Tools used by Adobe font developers for wrapping up PostScript fonts as OpenType/CFF font files
 	pkgver = 2.7.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.adobe.com/devnet/opentype/afdko.html
 	arch = x86_64
 	license = custom
@@ -16,6 +16,7 @@ pkgbase = afdko
 	depends = python2-robofab
 	depends = python2-wheel
 	depends = python2-ufonormalizer-git
+	conflicts = afdko-git
 	source = https://github.com/adobe-type-tools/afdko/releases/download/2.7.2/afdko-2.7.2.tar.gz
 	sha256sums = d31c68cf0ae2e1760bf557c0b373c9e31811cbaebe2b5fe1c34785c718484d74
 	depends_x86_64 = lib32-glibc
diff --git a/PKGBUILD b/PKGBUILD
index 3c6d33e0711a..beb22c8efd16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=afdko
 pkgver=2.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Tools used by Adobe font developers for wrapping up PostScript fonts as OpenType/CFF font files'
 arch=('x86_64')
-url='http://www.adobe.com/devnet/opentype/afdko.html'
+url="http://www.adobe.com/devnet/opentype/${pkgname}.html"
 license=('custom')
 depends=('python2'
          'python2-booleanoperations'
@@ -18,6 +18,7 @@ depends=('python2'
          'python2-wheel'
          'python2-ufonormalizer-git')
 depends_x86_64=('lib32-glibc')
+conflicts=("${pkgname}-git")
 source=("https://github.com/adobe-type-tools/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('d31c68cf0ae2e1760bf557c0b373c9e31811cbaebe2b5fe1c34785c718484d74')