[arch-commits] Commit in ibm-sw-tpm2/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Saturday, June 20, 2020 @ 22:48:26
  Author: diabonas
Revision: 648680

upgpkg: ibm-sw-tpm2 1636-1: upstream release

Also respect the makepkg CPPFLAGS and use the installation rule provided by the
Makefile.

Modified:
  ibm-sw-tpm2/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-20 22:45:32 UTC (rev 648679)
+++ PKGBUILD	2020-06-20 22:48:26 UTC (rev 648680)
@@ -1,34 +1,31 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 # Contributor: Bruno Pagani <archange at archlinux.org>
 pkgname=ibm-sw-tpm2
-pkgver=1628
-pkgrel=2
+pkgver=1636
+pkgrel=1
 pkgdesc='Implementation of the TCG Trusted Platform Module 2.0 specification'
 arch=('x86_64')
 url='https://sourceforge.net/projects/ibmswtpm2/'
 license=('BSD')
 depends=('openssl')
-source=("https://downloads.sourceforge.net/${pkgname//-}/ibmtpm$pkgver.tar.gz"
-        "ibm-sw-tpm2-1628-increase-nv-memory.patch::https://github.com/kgoldman/ibmswtpm2/commit/3e535e65e307ef9ce02d87993e98ec5dbf7e6dc2.patch")
-sha512sums=('ab47caa4406ba57c0afc6fadae304fc9ef5e3e125be0f2fb1955a419cf93cd5e9176e103f0b566825abc16cca00b795f98d2b407f0a2bf7b141ef4b025d907d0'
-            '6fd3319f7f3a1aa56af1964a8e4ccb211240232035910c4cdc1738b3c9787ba619dcbdffdae4a9dda1c853de734a176fb87c9b51b076b9c89e253f2ce2adf355')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kgoldman/ibmswtpm2/archive/rev$pkgver.tar.gz")
+sha512sums=('3540486b21ade92a50fc1e2b41b23f6afefe23e1de05dd009e0ade021bac2f6ca0d61d4b61af9466f3c70327047ebf9b8d6891c100b1949a0d9c0c81335cbb10')
 
 prepare() {
-	sed -e 's|$(CCFLAGS)|& $(CFLAGS)|' \
-	    -e 's|$(LNFLAGS)|& $(LDFLAGS)|' \
-	    -e 's|-Werror ||' -e 's|-ggdb -O0||' \
-	    -i src/makefile
-
-	# Increase NV memory (https://github.com/kgoldman/ibmswtpm2/pull/4)
-	patch --strip=1 --input="$srcdir/ibm-sw-tpm2-1628-increase-nv-memory.patch"
+	cd "${pkgname//-}-rev$pkgver/src"
+	sed -e 's/$(CCFLAGS)/$(CPPFLAGS) & $(CFLAGS)/' \
+	    -e 's/$(LNFLAGS)/& $(LDFLAGS)/' \
+	    -e 's/-ggdb//' -e 's/-O0//' -e 's/-Werror//' \
+	    -i makefile
 }
 
 build() {
-	cd src
+	cd "${pkgname//-}-rev$pkgver/src"
 	make
 }
 
 package() {
-	install -Dm755 src/tpm_server -t "$pkgdir/usr/bin"
+	cd "${pkgname//-}-rev$pkgver/src"
+	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }