diff --git a/util/crypt/p11-kit/actions.py b/util/crypt/p11-kit/actions.py
index 39860014bb..05a75173c6 100644
--- a/util/crypt/p11-kit/actions.py
+++ b/util/crypt/p11-kit/actions.py
@@ -7,29 +7,30 @@
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import shelltools, mesontools
def setup():
- options = "--with-module-path=/usr/lib/pkcs11 \
- "
+ options = "-Dmodule_path=/usr/lib/pkcs11 -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt -Dman=true -Dgtk_doc=true\
+ "
if get.buildTYPE() == "emul32":
shelltools.export("CC", "%s -m32" % get.CC())
shelltools.export("CXX", "%s -m32" % get.CXX())
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
- options += "--libdir=/usr/lib32 \
+ options += " --libdir=/usr/lib32 \
--libexecdir=/_emul32/libexec \
- --with-module-path=/usr/lib32/pkcs11"
+ --bindir=/_emul32/bin \
+ -Dmodule_path=/usr/lib32/pkcs11"
- autotools.configure(options)
+ mesontools.configure(options)
def build():
- autotools.make()
+ mesontools.build()
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ mesontools.install()
if get.buildTYPE() == "emul32":
pisitools.removeDir("_emul32")
diff --git a/util/crypt/p11-kit/pspec.xml b/util/crypt/p11-kit/pspec.xml
index 9a7522179f..b89877f2f0 100644
--- a/util/crypt/p11-kit/pspec.xml
+++ b/util/crypt/p11-kit/pspec.xml
@@ -15,6 +15,9 @@
The p11-kit package Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.
https://github.com/p11-glue/p11-kit/releases/download/0.25.1/p11-kit-0.25.1.tar.xz
+ meson
+ gtk-doc
+ glib2-devel
libtasn1-devel
libffi-devel
@@ -34,7 +37,9 @@
/usr/share/gtk-doc
/usr/share/p11-kit
/usr/lib
+ /usr/share/locale/
/usr/share/bash-completion
+ /usr/share/man