From 34da83c4f9ec77a328891b897eb8bf7adc0a006b Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 22 Jul 2019 18:53:27 +0200
Subject: [PATCH] libcacard-2.7.0

---
 .gitignore     |  3 +++
 libcacard.spec | 21 +++++++++++++++++++--
 sources        |  4 +++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index de2cfb5..906ecaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 /libcacard-2.5.3.tar.xz
 /libcacard-2.6.0.tar.xz
 /libcacard-2.6.1.tar.xz
+/libcacard-2.7.0.tar.xz
+/libcacard-2.7.0.tar.xz.asc
+/gpgkey-15B5C33D.gpg
diff --git a/libcacard.spec b/libcacard.spec
index abeb6c3..65da263 100644
--- a/libcacard.spec
+++ b/libcacard.spec
@@ -1,15 +1,24 @@
 Name:           libcacard
-Version:        2.6.1
-Release:        2%{?dist}
+Version:        2.7.0
+Release:        1%{?dist}
 Summary:        CAC (Common Access Card) library
 License:        LGPLv2+
 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-15B5C33D.gpg
 Epoch:          3
 
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
 BuildRequires:  nss-devel
+BuildRequires:  softhsm
+BuildRequires:  opensc
+BuildRequires:  gnutls-utils
+BuildRequires:  nss-tools
+BuildRequires:  openssl
+BuildRequires:  lcov
+BuildRequires:  gnupg2
 Conflicts:      qemu-common < 2:2.5.0
 
 %description
@@ -28,6 +37,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
+gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %setup -q
 
 %build
@@ -35,6 +45,13 @@ developing applications that use %{name}.
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 
+%check
+# Do not run the tests on s390x, which fails
+%ifnarch s390x
+sed -i "s!/usr/lib64/!%{_libdir}/!" tests/setup-softhsm2.sh
+make check
+%endif
+
 %install
 %make_install
 rm -f %{buildroot}%{_libdir}/*.la
diff --git a/sources b/sources
index 403147e..40c6d7c 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (libcacard-2.6.1.tar.xz) = 1df2fa0cf46ee503cebb3a6f28c5e11609ec19dbf4e146d6d89ea59ddc7fcace45fc02adf852bfa385ae1ba1a889e9731a034b5e6630d45f3475cbc093e3aa2d
+SHA512 (libcacard-2.7.0.tar.xz) = 347c13396e6777193e4e158321605410f4cbd90727c1ba8d85a1aac41d5ada96728dbef367ed4027d16dd0b10c8a4d0cf902ce3345334be4c78994cf72c58352
+SHA512 (libcacard-2.7.0.tar.xz.asc) = a8890117610a0d89019fee5c2ec67a8e383095a39ce56b3a2d092c6e1164435888c5128f9ca303689ffa304f4bcdf71bfab9b2218361bb352427c58dae54dce0
+SHA512 (gpgkey-15B5C33D.gpg) = 7f17283e5ea7e173d867ff815370c37b138df4fd8b7310f8a6eca13c5af90b0e6bd51bac79c0d3265021f6ae0e0e32f738ba4e12ba21e5302d628c235d5aed58