summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Hernandez-Cerdan2018-05-23 13:08:42 -0400
committerPablo Hernandez-Cerdan2018-05-23 13:08:42 -0400
commitf7bac675da5f1981fc4728179e6a167d8bc68119 (patch)
treea5c0c1a31e1725966eed689aec36c5634a05fdef
parent22c5e8a75197557a0c20919936b5e9fbf8cf18a0 (diff)
downloadaur-f7bac675da5f1981fc4728179e6a167d8bc68119.tar.gz
Add conflicts ninja
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dddaa4448987..0c636fe6516f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = ninja-kitware
makedepends = emacs-nox
depends = gcc-libs
provides = ninja
+ conflicts = ninja
source = ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip::https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip
md5sums = 3bb7477df90f4a388ead79a917902710
diff --git a/PKGBUILD b/PKGBUILD
index 6d08f0345dfb..00226bf85706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ pkgdesc='Small build system with a focus on speed - Kitware version with JobServ
arch=(x86_64)
url='https://github.com/Kitware/ninja'
provides=(ninja)
+conflicts=(ninja)
license=(Apache)
depends=(gcc-libs)
makedepends=(python2 re2c emacs-nox)