2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d2e9f1e5715..f1404fd23b96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spivak
 	pkgdesc = Karaoke player based on GStreamer and Qt5
 	pkgver = 1.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/gyunaev/spivak
 	arch = x86_64
 	license = GPL3
@@ -9,6 +9,7 @@ pkgbase = spivak
 	depends = libzip
 	depends = qt5-base
 	depends = uchardet
+	conflicts = spivak-git
 	source = spivak-1.4.tar.gz::https://github.com/gyunaev/spivak/archive/1.4.tar.gz
 	source = incomplete_type.patch
 	sha256sums = e64a5d46ed6cfb5ed0c6fcb46a956155a28dd75b87a5de9394d69ec593aa7859
diff --git a/PKGBUILD b/PKGBUILD
index 57798961be26..5bcf5bbbf703 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
-# Maintainer: mrxx <mrxx at cyberhome dot at>
+# Maintainer: Jose Riha <jose1711 gmail com>
+# Contributor: mrxx <mrxx at cyberhome dot at>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=spivak
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Karaoke player based on GStreamer and Qt5"
 arch=(x86_64)
 url="https://github.com/gyunaev/spivak"
 license=(GPL3)
 depends=(gst-plugins-base libzip qt5-base uchardet)
+conflicts=(spivak-git)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gyunaev/$pkgname/archive/$pkgver.tar.gz" "incomplete_type.patch")
 sha256sums=('e64a5d46ed6cfb5ed0c6fcb46a956155a28dd75b87a5de9394d69ec593aa7859'
             '2f2365bb82c3a8f026ea7a5f651d48bb14033cc09ff5169cf5fda2178729cea9')