summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2ce6f2789cf2..22b39664144e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = caddy
arch = armv7h
arch = aarch64
license = Apache
+ conflicts = caddy
conflicts = caddy-git
source = caddy.service
sha256sums = 244fa03febae623f1b10adfb6883a9573ba81747b8e535bb23101ab230ccbf95
diff --git a/PKGBUILD b/PKGBUILD
index d766eed3cf89..6fd0c6932a96 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-git')
+conflicts=('caddy' 'caddy-git')
source=('caddy.service')
sha256sums=('244fa03febae623f1b10adfb6883a9573ba81747b8e535bb23101ab230ccbf95')