Conflicts with git version

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc0aa0e8fc54..3ddddd6525aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = xfce4-docklike-plugin
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = git
 	makedepends = xfce4-dev-tools
 	makedepends = intltool
 	depends = xfce4-panel>=4.4
@@ -15,6 +14,7 @@ pkgbase = xfce4-docklike-plugin
 	depends = gtk3
 	depends = cairo
 	depends = glib2
+	conflicts = xfce4-docklike-plugin-git
 	source = https://github.com/davekeogh/xfce4-docklike-plugin/archive/v0.2.0.zip
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 2d53c1ae7ed1..4f3a28f6d2c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 # Contributer: nsz32 <nszabo2 at gmail dot com>
 
 pkgname="xfce4-docklike-plugin"
-pkgver=0.2.0
+pkgver="0.2.0"
 pkgrel=1
 pkgdesc='A modern, docklike, minimalist taskbar for XFCE'
 arch=('i686' 'x86_64')
 url='https://github.com/nsz32/docklike-plugin'
 license=('GPL3')
 depends=('xfce4-panel>=4.4' 'libwnck3' 'libxfce4ui' 'gtk3' 'cairo' 'glib2')
-makedepends=('git' 'xfce4-dev-tools' 'intltool')
+makedepends=('xfce4-dev-tools' 'intltool')
+conflicts=("${pkgname}-git")
 
 source=("https://github.com/davekeogh/xfce4-docklike-plugin/archive/v${pkgver}.zip")
 sha512sums=('SKIP')