PKGBUILD: Adding new maintainer. Switching to correct license (GPL2, LGPL2.1). Exporting PYTHON_VERS once, as it's only required for building. Moving bash-completion to correct location.

2 files changed, 31 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38907145b841..bb2e5197c920 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = trace-cmd
 	pkgdesc = Userspace tooling for the Linux kernel Ftrace internal tracer
 	pkgver = 2.8.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
 	arch = x86_64
 	arch = aarch64
 	license = GPL2
+	license = LGPL2.1
 	makedepends = python
 	makedepends = swig
 	makedepends = asciidoc
-	optdepends = python: for the Python plugins
-	provides = trace-cmd
-	conflicts = trace-cmd-git
+	depends = audit
+	depends = glibc
+	optdepends = python: for Python plugins
 	source = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
-	sha256sums = 706564b147bd966957431c4ca70032947d59c5d977c1ac2942b1b5a8668e7a6f
+	sha512sums = 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
 
 pkgname = trace-cmd
 
diff --git a/PKGBUILD b/PKGBUILD
index b4c153598b6d..bd75d80c95b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,39 @@
-# Current Maintainer: Troy Engel <troyengel+arch@gmail.com>
+# Maintainer: David Runge <dave@sleepmap.de>
+# Contributor: Troy Engel <troyengel+arch@gmail.com>
 
 pkgname=trace-cmd
 pkgver=2.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace tooling for the Linux kernel Ftrace internal tracer"
 arch=('x86_64' 'aarch64')
 url="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-license=('GPL2')
+license=('GPL2' 'LGPL2.1')
+depends=('audit' 'glibc')
 makedepends=('python' 'swig' 'asciidoc')
-optdepends=('python: for the Python plugins')
-provides=('trace-cmd')
-conflicts=('trace-cmd-git')
+optdepends=('python: for Python plugins')
 source=("https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
-sha256sums=('706564b147bd966957431c4ca70032947d59c5d977c1ac2942b1b5a8668e7a6f')
+sha512sums=('51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b')
+
+prepare() {
+  mv -v "${pkgname}-v${pkgver}" "${pkgname}-${pkgver}"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-v${pkgver}"
-  
-  make PYTHON_VERS=python3 prefix="/usr" all doc
+  cd "${pkgname}-${pkgver}"
+  export PYTHON_VERS=python3
+  make trace-cmd doc
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-v${pkgver}"
-
-  make PYTHON_VERS=python3 prefix="/usr" DESTDIR="$pkgdir" \
-    install install_doc
-
-  # Remove the KernelShark docs from this package
-  rm -rf "${pkgdir}/usr/share/kernelshark"
-  rm -f "${pkgdir}/usr/share/man/man1/kernelshark.1"
+  cd "${pkgname}-${pkgver}"
+  make prefix="/usr" DESTDIR="${pkgdir}/" install install_doc
+  # removing python2 script
+  rm -v "${pkgdir}/usr/lib/trace-cmd/python/event-viewer.py"
+  # installing bash completion to correct location and removing /etc
+  install -vDm 644 "${pkgdir}/etc/bash_completion.d/trace-cmd.bash" \
+    "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
+  rm -rv "${pkgdir}/etc"
+  # remove unrelated documentation
+  rm -vrf "${pkgdir}/usr/share/kernelshark"
+  rm -vf "${pkgdir}/usr/share/man/man1/kernelshark.1"
 }