summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sobolevskiy2017-10-10 10:12:16 +0000
committerAlexander Sobolevskiy2017-10-10 10:12:16 +0000
commit4ef7b4021e2ae138d3c0f9273465db7e22c58c9f (patch)
tree38536fadb0139c73c43b06d0c41ebd22ac4753a5
parent765903e5380cf20b894abd27761cc527a78e45ef (diff)
downloadaur-4ef7b4021e2ae138d3c0f9273465db7e22c58c9f.tar.gz
fix conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
-rw-r--r--aerospike-client-c-libuv.install8
3 files changed, 5 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index caa797070b89..6b8410f156b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = aerospike-client-c-libuv
pkgdesc = The Aerospike C client provides a C interface for interacting with the Aerospike Database.
pkgver = 4.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/aerospike/aerospike-client-c
- install = aerospike-client-c-libuv.install
arch = any
license = Proprietary
makedepends = git
depends = libuv
depends = python2
- conflicts = aerospike-client-c-libev
+ conflicts = aerospike-client-c-libev,
+ conflicts = aerospike-client-c-libevent
pkgname = aerospike-client-c-libuv
diff --git a/PKGBUILD b/PKGBUILD
index 5dd608cad1d8..de0e64d6b3db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,14 @@
pkgname=aerospike-client-c-libuv
pkgver=4.1.10
-pkgrel=1
+pkgrel=2
pkgdesc="The Aerospike C client provides a C interface for interacting with the Aerospike Database."
arch=('any')
url="https://github.com/aerospike/aerospike-client-c"
-install=aerospike-client-c-libuv.install
license=('Proprietary')
depends=('libuv' 'python2')
makedepends=('git')
-conflicts=('aerospike-client-c-libev')
+conflicts=('aerospike-client-c-libev', 'aerospike-client-c-libevent')
_gitroot="https://github.com/aerospike/aerospike-client-c.git"
_gitname="aerospike-client-c"
diff --git a/aerospike-client-c-libuv.install b/aerospike-client-c-libuv.install
deleted file mode 100644
index c54c32d97da5..000000000000
--- a/aerospike-client-c-libuv.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install(){
- echo
- echo ":: Node.js Aerospike client install:"
- echo "--------------------------------"
- echo " npm install aerospike"
- echo "--------------------------------"
-
-}