summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Darwinkel2015-06-27 16:16:55 +0200
committerPatrick Darwinkel2015-06-27 16:16:55 +0200
commitd1c7c7374ed7dba83ab06de79fd0a665784ab8ce (patch)
treef142e69c3f71cab48d9de2a7fa244d6f8b05f5c8
parentde45dac42ceb41fd251c37d97b06d95a80d5e003 (diff)
downloadaur-d1c7c7374ed7dba83ab06de79fd0a665784ab8ce.tar.gz
It now conflicts with the original, outdated Ogar package.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b23e303feb8e..c5512d5eadcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = ogar-git
depends = npm
depends = git
depends = systemd
+ conflicts= ogar
backup = usr/share/ogar/gameserver.ini
source = git+https://github.com/vram4/Ogar.git
source = ogar.service
diff --git a/PKGBUILD b/PKGBUILD
index 26bcf0be3b9b..5da8800d9ca8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ arch=(any)
url="https://github.com/vram4/Ogar"
license=('Apache')
depends=('nodejs' 'npm' 'git' 'systemd')
+conflicts=('ogar')
source=('git+https://github.com/vram4/Ogar.git' 'ogar.service')
sha1sums=('SKIP' '17e04c0c5872f64ed05bf0f6844ee276210d7bda')
install="${pkgname}.install"