summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Edgecombe2015-12-01 21:31:13 +0000
committerGraham Edgecombe2015-12-01 21:31:13 +0000
commitae0947d9bd8f013c5954a00ab8190c0ab378133c (patch)
treed7d614ea8d96594e7ed74824e33de58284b081c1
parentd7b30e8dda09c3c5dd3d6f5950eebf9df5a536bc (diff)
downloadaur-ae0947d9bd8f013c5954a00ab8190c0ab378133c.tar.gz
Revert "Get rid of conflicts/provides."
This reverts commit d7b30e8dda09c3c5dd3d6f5950eebf9df5a536bc. Wrong repo!
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e450dcf705af..45958e712a1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,8 @@ pkgbase = openrct2-git
depends = lib32-curl
depends = lib32-jansson
depends = lib32-speexdsp
+ provides = openrct2
+ conflicts = openrct2
options = !buildflags
source = openrct2-git::git+https://github.com/OpenRCT2/OpenRCT2.git#branch=develop
source = https://openrct.net/launcher/libs/orctlibs.zip
diff --git a/PKGBUILD b/PKGBUILD
index 30e8d3b587ff..57d6a9ed652d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,8 @@ url='https://github.com/OpenRCT2/OpenRCT2'
license=('GPL3')
depends=('gtk-update-icon-cache' 'desktop-file-utils')
makedepends=('git' 'cmake')
+conflicts=('openrct2')
+provides=('openrct2')
options=('!buildflags')
install=openrct2.install
source=("$pkgname"::'git+https://github.com/OpenRCT2/OpenRCT2.git#branch=develop'