Change in PKGBUILD: conflict with package olive-git

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 454555f4329a..4306cf4ab26a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = olive
 	pkgdesc = Free non-linear video editor
 	pkgver = 20181223
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.olivevideoeditor.org/
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = olive
 	makedepends = libicns
 	depends = ffmpeg
 	depends = qt5-multimedia
+	conflicts = olive-git
 	source = 20181223.tar.gz::https://github.com/olive-editor/olive/archive/20181223.tar.gz
 	source = olive.desktop
 	sha512sums = b9421faa8bc03855cd51837d1f4a264eea1e32d8a4a2fdbb033f4a5a5622220215c66b52b08ba4eb62788665e065b8bfdf43eae6383f4cf6b8e2bd36c5625f95
diff --git a/PKGBUILD b/PKGBUILD
index da7145f1ae7a..316d47514273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 
 pkgname=olive
 pkgver=20181223
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Free non-linear video editor"
 url="https://www.olivevideoeditor.org/"
 license=('GPL3')
 depends=('ffmpeg' 'qt5-multimedia')
 makedepends=('libicns')
+conflicts=('olive-git')
 source=("${pkgver}.tar.gz::https://github.com/olive-editor/olive/archive/${pkgver}.tar.gz"
         "olive.desktop"
        )