summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2017-08-21 21:38:18 -0400
committerKyle Sferrazza2017-08-21 21:38:18 -0400
commit858725c15077c40cca813afe4decc28fa21eedb6 (patch)
treebb8dcc18af1632931d4ce57651d18afbc34a1dd4
parent1f8f833d05895f7b7093abc8edcaf188229d4efd (diff)
downloadaur-858725c15077c40cca813afe4decc28fa21eedb6.tar.gz
proper conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 78025022a626..f1b3c9609161 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = powershell-git
pkgdesc = A cross-platform automation and configuration tool/framework (git version)
pkgver = 6.0.0.beta.5.78.gcdbbb7a4b
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/PowerShell/PowerShell
install = powershell.install
arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = powershell-git
makedepends = dotnet-sdk-2.0
depends = icu
provides = powershell
+ conflicts = powershell
source = powershell::git+https://github.com/PowerShell/PowerShell.git
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 9f2528ccb383..117cf91feeb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname='powershell-git'
_pkgname='powershell'
pkgver=6.0.0.beta.5.78.gcdbbb7a4b
-pkgrel=1
+pkgrel=2
pkgdesc="A cross-platform automation and configuration tool/framework (git version)"
arch=('x86_64')
url="https://github.com/PowerShell/PowerShell"
@@ -11,6 +11,7 @@ license=('MIT')
makedepends=('git' 'cmake' 'dotnet-sdk-2.0')
depends=('icu')
provides=('powershell')
+conflicts=('powershell')
source=($_pkgname::'git+https://github.com/PowerShell/PowerShell.git'
'pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop'
'googletest::git+https://github.com/google/googletest.git')