upgpkg: 7.4.1-2

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cbd9c9e42d6..893de875b1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = powershell-bin
 	pkgdesc = A cross-platform automation and configuration tool/framework (binary package)
 	pkgver = 7.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Powershell/Powershell
 	install = powershell.install
 	arch = x86_64
@@ -10,17 +10,17 @@ pkgbase = powershell-bin
 	license = MIT
 	depends = gcc-libs
 	depends = glibc
-	depends = lttng-ust2.12
 	depends = zlib
+	optdepends = lttng-ust2.12: CoreCLR tracing
 	provides = powershell
 	conflicts = powershell
-	noextract = powershell-bin-7.4.1-1.tar.gz
+	noextract = powershell-bin-7.4.1-2.tar.gz
 	options = staticlibs
-	source_x86_64 = powershell-bin-7.4.1-1.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-x64.tar.gz
+	source_x86_64 = powershell-bin-7.4.1-2.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-x64.tar.gz
 	sha256sums_x86_64 = 8beabac4431b75e9b67c6d9fafd8b02cc019f21f230ea3d94aec1348c50529d3
-	source_armv7h = powershell-bin-7.4.1-1.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-arm32.tar.gz
+	source_armv7h = powershell-bin-7.4.1-2.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-arm32.tar.gz
 	sha256sums_armv7h = ba66844392026779145c10a72d9b9096fe9f71f196aecffce45678c25d37c007
-	source_aarch64 = powershell-bin-7.4.1-1.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-arm64.tar.gz
+	source_aarch64 = powershell-bin-7.4.1-2.tar.gz::https://github.com/Powershell/Powershell/releases/download/v7.4.1/powershell-7.4.1-linux-arm64.tar.gz
 	sha256sums_aarch64 = 719c11544a1f6322f2c58f5591ff7abb7768aef97ef0a382e3711f89fa2ade22
 
 pkgname = powershell-bin
diff --git a/PKGBUILD b/PKGBUILD
index 122580815421..710cabd8ae4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Tomasz Hamerla <tomasz.hamerla@outlook.com>
 
 pkgname=powershell-bin
-_name=${pkgname%-bin}
+_pkgname=${pkgname%-bin}
 pkgver=7.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform automation and configuration tool/framework (binary package)"
 arch=(x86_64 armv7h aarch64)
 url="https://github.com/Powershell/Powershell"
@@ -13,9 +13,9 @@ license=(MIT)
 depends=(
   gcc-libs
   glibc
-  lttng-ust2.12
   zlib
 )
+optdepends=('lttng-ust2.12: CoreCLR tracing')
 provides=(powershell)
 conflicts=(powershell)
 install=powershell.install
@@ -28,7 +28,6 @@ source_armv7h=("$_artifact::$url/releases/download/v$pkgver/powershell-$pkgver-l
 source_aarch64=("$_artifact::$url/releases/download/v$pkgver/powershell-$pkgver-linux-arm64.tar.gz")
 source_x86_64=("$_artifact::$url/releases/download/v$pkgver/powershell-$pkgver-linux-x64.tar.gz")
 noextract=("$_artifact")
-
 sha256sums_x86_64=('8beabac4431b75e9b67c6d9fafd8b02cc019f21f230ea3d94aec1348c50529d3')
 sha256sums_armv7h=('ba66844392026779145c10a72d9b9096fe9f71f196aecffce45678c25d37c007')
 sha256sums_aarch64=('719c11544a1f6322f2c58f5591ff7abb7768aef97ef0a382e3711f89fa2ade22')
@@ -43,11 +42,11 @@ package() {
 
   local pkgnum=${pkgver:0:1}
 
-  mkdir -p "$pkgdir/opt/microsoft/$_name/$pkgnum"
-  cp -ar "./." "$pkgdir/opt/microsoft/$_name/$pkgnum/"
+  install -dm755 "$pkgdir/usr/lib/$_pkgname-$pkgnum"
+  cp --archive -t "$pkgdir/usr/lib/$_pkgname-$pkgnum" ./*
 
-  mkdir -p "$pkgdir/usr/bin/"
-  ln -s "/opt/microsoft/$_name/$pkgnum/pwsh" "$pkgdir/usr/bin/pwsh"
+  install -dm755 "$pkgdir/usr/bin"
+  ln -s "/usr/lib/$_pkgname-$pkgnum/pwsh" "$pkgdir/usr/bin/pwsh"
 
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE.txt
 }