summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2017-06-06 21:28:21 -0400
committerKyle Sferrazza2017-06-06 21:28:21 -0400
commit86ffd10af68f52fc7739019b6312c69c5375901f (patch)
treedc6f519a7ca0d1ea5fb469a90912bb1209f5a60a
parent8aa0107d2123a0858801b49daa9278f82c0f2a29 (diff)
downloadaur-86ffd10af68f52fc7739019b6312c69c5375901f.tar.gz
conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3255f5a4abf..1782ebffb60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = powershell
pkgdesc = A cross-platform automation and configuration tool/framework (latest release)
pkgver = 6.0.0.beta.2
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/PowerShell/PowerShell
arch = x86_64
license = MIT
@@ -10,6 +10,7 @@ pkgbase = powershell
makedepends = proot
makedepends = dotnet-cli-git
depends = icu
+ conflicts = powershell-git
source = powershell::git+https://github.com/PowerShell/PowerShell.git#tag=v6.0.0-beta.2
source = pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop
source = googletest::git+https://github.com/google/googletest.git
diff --git a/PKGBUILD b/PKGBUILD
index bf0cb9fb660..7566a80c97a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
pkgname=powershell
_pkgver=6.0.0-beta.2
pkgver=${_pkgver/-/.}
-pkgrel=2
+pkgrel=3
pkgdesc="A cross-platform automation and configuration tool/framework (latest release)"
arch=('x86_64')
url="https://github.com/PowerShell/PowerShell"
license=('MIT')
makedepends=('git' 'cmake' 'proot' 'dotnet-cli-git')
depends=('icu')
+conflicts=('powershell-git')
source=($pkgname::git+https://github.com/PowerShell/PowerShell.git#tag=v$_pkgver
pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop
googletest::git+https://github.com/google/googletest.git