summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Javorski2017-01-28 17:04:08 -0800
committerMike Javorski2017-01-28 17:04:08 -0800
commit5f8c83e70c13e196fb328af89560feb10f79b95c (patch)
treec50d0738888ba7695a84acc55cb51cca7343d7e9
parent7d9d8010783b1c066a2fc268f6badcb2db2edd9c (diff)
downloadaur-5f8c83e70c13e196fb328af89560feb10f79b95c.tar.gz
Provide docker rather than simply conflicting so it works with other packages
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 011d82a591c0..54701173be1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = docker-bin
pkgdesc = Pack, ship and run any application as a lightweight container, using official binaries
pkgver = 1.13.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.docker.com/
install = docker-bin.install
arch = x86_64
@@ -15,7 +15,7 @@ pkgbase = docker-bin
depends = libseccomp
optdepends = btrfs-progs: btrfs backend support
optdepends = lxc: lxc backend support
- conflicts = docker
+ provides = docker
conflicts = docker-git
options = !strip
source = https://get.docker.com/builds/Linux/x86_64/docker-1.13.0.tgz
diff --git a/PKGBUILD b/PKGBUILD
index a6477b0a5496..e84bc8521f67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,12 @@
pkgname=docker-bin
pkgver=1.13.0
-pkgrel=1
+pkgrel=2
pkgdesc='Pack, ship and run any application as a lightweight container, using official binaries'
arch=('x86_64')
url='https://www.docker.com/'
license=('Apache')
+provides=('docker')
conflicts=('docker' 'docker-git')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
makedepends=('go-md2man')