added conflicts array

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26628de56d0b..2ede5ef25d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = dockly
 	pkgdesc = Immersive terminal interface for managing docker containers and services
 	pkgver = 3.21.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://lirantal.github.io/dockly
 	arch = any
 	license = MIT
 	makedepends = npm
 	makedepends = jq
 	depends = nodejs
+	depends = libx11
+	conflicts = nodejs-live-server
 	noextract = dockly-3.21.4.tar.gz
 	source = dockly-3.21.4.tar.gz::https://github.com/lirantal/dockly/archive/v3.21.4.tar.gz
 	sha256sums = 9f2377ef48d67f65645d673ad91a7d5611a8bc95d5357508c59712c08ded3817
diff --git a/PKGBUILD b/PKGBUILD
index 3b28b0785ebf..f1c04e30f478 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dockly
 pkgver=3.21.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Immersive terminal interface for managing docker containers and services"
 arch=('any')
 url='https://lirantal.github.io/dockly'
@@ -10,6 +10,7 @@ license=('MIT')
 depends=('nodejs'
          'libx11')
 makedepends=('npm' 'jq')
+conflicts=('nodejs-live-server')
 noextract=("${pkgname}-${pkgver}.tar.gz")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/lirantal/dockly/archive/v${pkgver}.tar.gz")
 sha256sums=('9f2377ef48d67f65645d673ad91a7d5611a8bc95d5357508c59712c08ded3817')