Clean up PKGBUILD and update maintainer

2 files changed, 27 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bd43db275e5..1ae2558c6042 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
-# Generated by mksrcinfo v8
-# Sun Feb 25 08:18:42 UTC 2018
 pkgbase = tpm2-tss-git
 	pkgdesc = TPM (Trusted Platform Module) 2.0 Software Stack (TSS)
-	pkgver = 1.1.0.r495.g3a38292
+	pkgver = 2.0.0.r38.91e7bd65
 	pkgrel = 1
 	url = https://github.com/tpm2-software/tpm2-tss
-	arch = i686
 	arch = x86_64
-	license = custom
+	license = BSD
 	makedepends = git
-	makedepends = cmocka
 	makedepends = autoconf-archive
+	makedepends = cmocka>=1.0.0
 	depends = libgcrypt
-	depends = uriparser
 	provides = tpm2-tss
 	conflicts = tpm2-tss
-	source = git+https://github.com/tpm2-software/tpm2-tss.git
+	source = tpm2-tss::git+https://github.com/tpm2-software/tpm2-tss.git
 	md5sums = SKIP
 
 pkgname = tpm2-tss-git
diff --git a/PKGBUILD b/PKGBUILD
index 506192d9193d..9be848f8b598 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,39 @@
-# Maintainer: Hexchain Tong <i at hexchain dot org>
+# Maintainer: Jonas Witschel <diabonas at gmx dot de>
+# Contributor: Hexchain Tong <i at hexchain dot org>
 
 pkgname=tpm2-tss-git
-pkgver=1.1.0.r495.g3a38292
-_pkgname=tpm2-tss
+pkgver=2.0.0.r38.91e7bd65
 pkgrel=1
-pkgdesc="TPM (Trusted Platform Module) 2.0 Software Stack (TSS)"
-arch=('i686' 'x86_64')
-provides=('tpm2-tss')
-conflicts=('tpm2-tss')
-url="https://github.com/tpm2-software/tpm2-tss"
-license=('custom')
-makedepends=('git' 'cmocka' 'autoconf-archive')
-depends=('libgcrypt' 'uriparser')
-source=("git+$url.git")
+pkgdesc='TPM (Trusted Platform Module) 2.0 Software Stack (TSS)'
+arch=('x86_64')
+url='https://github.com/tpm2-software/tpm2-tss'
+license=('BSD')
+depends=('libgcrypt')
+makedepends=('git' 'autoconf-archive' 'cmocka>=1.0.0')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("${pkgname%-git}::git+$url.git")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_pkgname"
-    (
-        set -o pipefail
-        git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-    )
+	cd "$srcdir/${pkgname%-git}"
+	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {
-    cd "$srcdir/$_pkgname"
-    ./bootstrap
-    ./configure --prefix=/usr --sbindir=/usr/bin --disable-static
-    make
+	cd "$srcdir/${pkgname%-git}"
+	./bootstrap
+	./configure --prefix=/usr --enable-unit --disable-static --with-pic
+	make
 }
 
 check() {
-    cd "$srcdir/$_pkgname"
-    make -k check
+	cd "$srcdir/${pkgname%-git}"
+	make -k check
 }
 
 package() {
-    cd "$srcdir/$_pkgname"
-    make DESTDIR="$pkgdir/" install
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	cd "$srcdir/${pkgname%-git}"
+	make DESTDIR="$pkgdir/" install
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }