summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxentec2015-08-14 06:44:50 +0200
committerxentec2015-08-14 06:44:50 +0200
commit15320354a4b5c05ef50741d51dbd8a4f03c42645 (patch)
treebdb3e6de92d29ed73b89b6c46ba5ea1f787e3a24
parentbf9fd5dff77e4ec71b5640a43c8eeae2d4386de7 (diff)
downloadaur-15320354a4b5c05ef50741d51dbd8a4f03c42645.tar.gz
Added missing conflict with non-git package
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 498a18ab6954..6bf9a29c824c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = glbinding-git
makedepends = gmock
makedepends = gtest
depends = libgl
+ conflicts = glbinding
source = glbinding-git::git+https://github.com/hpicgs/glbinding.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5d9863185c46..4021f1096e4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ license=('MIT')
depends=('libgl')
makedepends=('cmake' 'git' 'gmock' 'gtest')
+conflicts=('glbinding')
source=("$pkgname"::'git+https://github.com/hpicgs/glbinding.git')
sha256sums=('SKIP')