[arch-commits] Commit in clevis/trunk (PKGBUILD)

Jonas Witschel diabonas at archlinux.org
Tue Feb 9 17:59:18 UTC 2021


    Date: Tuesday, February 9, 2021 @ 17:59:18
  Author: diabonas
Revision: 851234

upgpkg: clevis 16-1: upstream release

- Remove patch included in this release
- Use meson instead of ninja to match the style of the package guidelines

Modified:
  clevis/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-09 17:59:12 UTC (rev 851233)
+++ PKGBUILD	2021-02-09 17:59:18 UTC (rev 851234)
@@ -1,8 +1,8 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=clevis
-pkgver=15
-_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # git rev-parse "v$pkgver^{}"
-pkgrel=2
+pkgver=16
+_commit=ca793a526fbb73cfe72ce046f98a49b8b6779ccd # git rev-parse "v$pkgver^{}"
+pkgrel=1
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')
 url='https://github.com/latchset/clevis'
@@ -29,27 +29,21 @@
 
 pkgver() {
 	cd "$pkgname"
-	git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	git describe --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd "$pkgname"
-	# Add support for tpm2-tools 5.0
-	git cherry-pick --no-commit ef76951e4486dadf41ca8085e09849466a0c7fd3
-}
-
 build() {
 	cd "$pkgname"
 	meson --prefix=/usr --libexecdir=/usr/lib --buildtype=plain build
-	ninja -C build
+	meson compile -C build
 }
 
 check() {
 	cd "$pkgname"
-	ninja -C build test
+	meson test -C build
 }
 
 package() {
 	cd "$pkgname"
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 }



More information about the arch-commits mailing list