Add 32bit compatible paths for softhsm
This commit is contained in:
parent
f0ac0b659e
commit
41d7dbb2cd
12
libcacard-2.8.0-32bit.patch
Normal file
12
libcacard-2.8.0-32bit.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/tests/setup-softhsm2.sh b/tests/setup-softhsm2.sh
|
||||
index 7523990..5341cd3 100755
|
||||
--- a/tests/setup-softhsm2.sh
|
||||
+++ b/tests/setup-softhsm2.sh
|
||||
@@ -8,6 +8,7 @@ PIN="77777777"
|
||||
export GNUTLS_PIN=$PIN
|
||||
|
||||
for P11LIB in \
|
||||
+ /usr/lib/pkcs11/libsofthsm2.so \
|
||||
/usr/lib64/pkcs11/libsofthsm2.so \
|
||||
/usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so \
|
||||
/usr/lib/softhsm/libsofthsm2.so \
|
@ -7,6 +7,8 @@ URL: https://gitlab.freedesktop.org/spice/libcacard
|
||||
Source0: http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz
|
||||
Source1: http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz.asc
|
||||
Source2: gpgkey-E37A484F.gpg
|
||||
# https://gitlab.freedesktop.org/spice/libcacard/-/merge_requests/24
|
||||
Patch0: libcacard-2.8.0-32bit.patch
|
||||
Epoch: 3
|
||||
|
||||
BuildRequires: gcc
|
||||
@ -41,6 +43,7 @@ developing applications that use %{name}.
|
||||
%prep
|
||||
gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%meson
|
||||
@ -49,7 +52,6 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%check
|
||||
# Do not run the tests on s390x, which fails
|
||||
%ifnarch s390x
|
||||
sed -i "s!/usr/lib64/!%{_libdir}/!" tests/setup-softhsm2.sh
|
||||
%meson_test
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user