Clean up PKGBUILD and update maintainer

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32826fc7d67c..728ec3b46339 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
-# Generated by mksrcinfo v8
-# Sat Aug 12 13:21:00 UTC 2017
 pkgbase = tpm2-tools-git
 	pkgdesc = TPM (Trusted Platform Module) 2.0 tools based on TPM2.0-TSS
-	pkgver = 2.0.0.r254.ga635550
+	pkgver = 3.0.2.r629.0e37ed6
 	pkgrel = 1
-	url = https://github.com/01org/tpm2.0-tools
-	arch = i686
+	url = https://github.com/tpm2-software/tpm2-tools
 	arch = x86_64
-	license = custom
+	license = BSD
+	checkdepends = cmocka>=1.0.0
 	makedepends = git
 	makedepends = autoconf-archive
-	depends = tpm2-abrmd
+	depends = tpm2-tss>=2.0.0
 	depends = curl
 	provides = tpm2-tools
 	conflicts = tpm2-tools
-	source = tpm2-tools-git::git+https://github.com/01org/tpm2.0-tools.git
+	source = tpm2-tools::git+https://github.com/tpm2-software/tpm2-tools.git
 	md5sums = SKIP
 
 pkgname = tpm2-tools-git
diff --git a/PKGBUILD b/PKGBUILD
index 77bc6026da51..446141ea7f7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,35 @@
-# 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-tools-git
-pkgver=2.0.0.r254.ga635550
+pkgver=3.0.2.r629.0e37ed6
 pkgrel=1
-pkgdesc="TPM (Trusted Platform Module) 2.0 tools based on TPM2.0-TSS"
-arch=('i686' 'x86_64')
-url="https://github.com/01org/tpm2.0-tools"
-license=('custom')
-provides=('tpm2-tools')
-conflicts=('tpm2-tools')
+pkgdesc='TPM (Trusted Platform Module) 2.0 tools based on TPM2.0-TSS'
+arch=('x86_64')
+url='https://github.com/tpm2-software/tpm2-tools'
+license=('BSD')
+depends=('tpm2-tss>=2.0.0' 'curl')
 makedepends=('git' 'autoconf-archive')
-depends=('tpm2-abrmd' 'curl')
-source=("$pkgname::git+https://github.com/01org/tpm2.0-tools.git")
+checkdepends=('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 --sysconfdir=/etc --disable-static --with-pic
+	make
 }
 
 package() {
-    cd "$srcdir/$pkgname"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-    make DESTDIR="$pkgdir" install
+	cd "$srcdir/${pkgname%-git}"
+	make DESTDIR="$pkgdir/" install
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }