Conflict with wp-cli-bin, license path

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca6d9210d4db..68535f1bff41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wp-cli-git
 	pkgdesc = A command-line tool for managing WordPress
 	pkgver = r8814.ae5557d7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://wp-cli.org/
 	arch = any
 	license = MIT
@@ -9,6 +9,7 @@ pkgbase = wp-cli-git
 	makedepends = composer
 	depends = php
 	conflicts = wp-cli
+	conflicts = wp-cli-bin
 	source = wp-cli-git::git+https://github.com/wp-cli/wp-cli-bundle.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index a9114fda1c39..d1ba943e2c07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=wp-cli-git
 pkgver=r8814.ae5557d7
-pkgrel=2
+pkgrel=3
 pkgdesc="A command-line tool for managing WordPress"
 url="http://wp-cli.org/"
 arch=('any')
 license=('MIT')
 depends=('php')
 makedepends=('git' 'composer')
-conflicts=('wp-cli')
+conflicts=('wp-cli' 'wp-cli-bin')
 source=("$pkgname::git+https://github.com/wp-cli/wp-cli-bundle.git")
 sha256sums=('SKIP')
 
@@ -50,7 +50,7 @@ check() {
 
 package() {
   cd ${pkgname}
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/wp-cli/LICENSE"
   install -Dm655 wp-cli.phar "${pkgdir}/usr/bin/wp"
   install -Dm644 vendor/wp-cli/wp-cli/utils/wp-completion.bash "${pkgdir}/usr/share/bash-completion/completions/wp"
 }