summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48ded9b9fdd..7b97388dfcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = lightspp
depends = git
depends = libcurlpp
depends = jsoncpp
+ conflicts = lightspp-git
pkgname = lightspp
diff --git a/PKGBUILD b/PKGBUILD
index 47175da0049..59c48b26c19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ arch=('x86_64')
url="https://github.com/jorbo/lightsplusplus"
license=('GPL')
depends=('gcc' 'git' 'libcurlpp' 'jsoncpp')
+conflicts=('lightspp-git')
build() {
git clone https://github.com/jorbo/lightsplusplus