summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a843d3a85070..d5109bfb81a8 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.1
- pkgrel = 1
+ pkgrel = 2
url = https://www.docker.com/
install = docker-bin.install
arch = x86_64
@@ -16,6 +16,7 @@ pkgbase = docker-bin
optdepends = btrfs-progs: btrfs backend support
optdepends = lxc: lxc backend support
provides = docker
+ conflicts = docker
conflicts = docker-git
options = !strip
source = https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz
diff --git a/PKGBUILD b/PKGBUILD
index b5d5669b7bc0..de7a52d8a558 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=docker-bin
pkgver=1.13.1
-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-git')
+conflicts=('docker' 'docker-git')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
makedepends=('go-md2man')
optdepends=('btrfs-progs: btrfs backend support'