* Fri May 31 2019 Paul Wouters <pwouters@redhat.com> - 2.5.0-4

- Pull in git master fixes to address assertion failure in make check
- Re-enable testing

softhsm.spec

@@ -1,9 +1,10 @@
 #global prever rc1
+%global prerelease yes
 
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
 Version: 2.5.0
-Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz
@@ -16,6 +17,8 @@ Requires(pre): shadow-utils
 Requires: p11-kit
 Requires: openssl-libs >= 1.0.1k-6
 
+Patch1: softhsm-2.5.0-updates.patch
+
 %global _hardened_build 1
 
 %global softhsm_module "SoftHSM PKCS #11 Module"
@@ -29,7 +32,7 @@ with other cryptographic products because of the PKCS#11 interface.
 %package devel
 Summary: Development package of softhsm that includes the header files
 Requires: %{name} = %{version}-%{release}, openssl-devel, sqlite-devel
-%if 0%{?prever:1}
+%if 0%{?prever:1} || 0%{?prerelease:1}
 BuildRequires: autoconf, libtool, automake
 %endif
 
@@ -38,18 +41,18 @@ The devel package contains the libsofthsm include files
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
+%patch1 -p1
 
-%if 0%{?prever:1}
+%if 0%{?prever:1} || 0%{?prerelease:1}
+   # pre-release or post-release snapshots fixup
+   sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
+   sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 autoreconf -fiv
+%else
+   # remove softhsm/ subdir auto-added to --libdir
+   sed -i 's:full_libdir/softhsm:full_libdir:g' configure
 %endif
 
-# remove softhsm/ subdir auto-added to --libdir
-sed -i "s:full_libdir/softhsm:full_libdir:g" configure
-%if 0%{?prever:1}
-sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
-%endif
-sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
-
 %build
 %configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --enable-eddsa --disable-gost \
            --with-migrate --enable-visibility --with-p11-kit=%{_datadir}/p11-kit/modules/
@@ -57,8 +60,7 @@ sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 make %{?_smp_mflags}
 
 %check
-# skip while cppunit is broken
-#make check
+make check
 
 %install
 rm -rf %{buildroot}
@@ -109,6 +111,10 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
+* Fri May 31 2019 Paul Wouters <pwouters@redhat.com> - 2.5.0-4
+- Pull in git master fixes to address assertion failure in make check
+- Re-enable testing
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild