summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2017-08-21 21:37:28 -0400
committerKyle Sferrazza2017-08-21 21:37:28 -0400
commitdb00aed14ff434629c667b4e37184afb9eb97f0f (patch)
treedad2a258e44e3fa43c64841c3e7e10f8770e2092
parent4b44824d4ed494ca208994095e86e572aa1381f7 (diff)
downloadaur-db00aed14ff434629c667b4e37184afb9eb97f0f.tar.gz
proper conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dcc69dce21a..7a9d8aa9c8b 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.5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/PowerShell/PowerShell
install = powershell.install
arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = powershell
makedepends = cmake
makedepends = dotnet-sdk-2.0
depends = icu
- conflicts = powershell-git
source = powershell::git+https://github.com/PowerShell/PowerShell.git#tag=v6.0.0-beta.5
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 fdf62b24613..32170016782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,13 @@
pkgname=powershell
_pkgver=6.0.0-beta.5
pkgver=${_pkgver/-/.}
-pkgrel=1
+pkgrel=2
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' 'dotnet-sdk-2.0')
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)