summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormnovick19882016-02-20 17:16:41 -0500
committermnovick19882016-02-20 17:16:41 -0500
commit74bee32f141bd141ff21ddea0ea17ba3ee66accb (patch)
tree94c2102866bd33da64bd7b4b5ebaaa1a301d320c
parent98e73e69a5032013ede1a441f57f14b7d680ce4f (diff)
downloadaur-74bee32f141bd141ff21ddea0ea17ba3ee66accb.tar.gz
Fixed PKGBUILD Syntax issue
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD1
2 files changed, 4 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae3566279e0f..13442ba83557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Feb 8 08:18:56 UTC 2016
+# Sat Feb 20 22:16:11 UTC 2016
pkgbase = ogre-git
pkgdesc = Scene-oriented, flexible 3D engine written in C++
pkgver = 2.2.0.r8509.37e9fc7b8ae8
@@ -27,6 +27,8 @@ pkgbase = ogre-git
depends = tinyxml
provides = ogre
provides = ogre-docs
+ conflicts = ogre
+ conflicts = ogre-docs
source = hg+http://bitbucket.org/sinbad/ogre
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fb2ba03b20cc..e505774b8cf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr'
'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu' 'tinyxml')
makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial')
provides=('ogre' 'ogre-docs')
+conflicts=('ogre' 'ogre-docs')
_dir="OGRE"
source=("hg+http://bitbucket.org/sinbad/ogre")
sha512sums=('SKIP')