summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Linz2016-07-27 14:59:15 +0200
committerAndreas Linz2016-07-27 14:59:38 +0200
commitcc9611bac6603efc1aa235970592f0db858cc046 (patch)
tree099b422f9ef61815b76d909bdff0293d31e6c350
parent59998ff4e20e09498da586dc528fc80d4424c3b2 (diff)
downloadaur-cc9611bac6603efc1aa235970592f0db858cc046.tar.gz
Add 'caddy-git' and 'caddy-all-features' to conflicting packages
Removed 'caddy' from conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD2
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a35d57538f5..b260dc9d22df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Wed Jul 27 12:58:57 UTC 2016
pkgbase = caddy
pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform
pkgver = 0.8.3
@@ -9,8 +11,9 @@ pkgbase = caddy
arch = armv7h
arch = aarch64
license = Apache
- conflicts = caddy
+ conflicts = caddy-all-features
conflicts = caddy-git
+ conflicts = caddy-full-bin
source_i686 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_386.tar.gz
sha256sums_i686 = 25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624
source_x86_64 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_amd64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 923edcecc004..6547bf46f868 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64')
url="https://caddyserver.com"
license=('Apache')
install='caddy.install'
-conflicts=('caddy' 'caddy-git')
+conflicts=('caddy-all-features' 'caddy-git' 'caddy-full-bin')
source_i686=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_386.tar.gz")
sha256sums_i686=('25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624')