From a3eb83fa88821a74167c8d94e49fb4b9c782a80c7f197995a7166483ca35090c Mon Sep 17 00:00:00 2001 From: Mark Post Date: Wed, 16 Jan 2019 21:38:23 +0000 Subject: [PATCH] Accepting request 666551 from home:markkp:branches:Base:System - Enable cryptsetup now that version 2 is included in SLES15 SP1. (Fate#325684) OBS-URL: https://build.opensuse.org/request/show/666551 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=69 --- s390-tools.changes | 6 ++++++ s390-tools.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/s390-tools.changes b/s390-tools.changes index 1b84ebb..97cfcaa 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 15 21:37:32 UTC 2019 - mpost@suse.com + +- Enable cryptsetup now that version 2 is included in SLES15 SP1. + (Fate#325684) + ------------------------------------------------------------------- Mon Jan 14 17:03:37 UTC 2019 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index 1264c24..865dfc2 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -194,6 +194,8 @@ BuildRequires: gcc-c++ BuildRequires: gettext-tools BuildRequires: glibc-devel-static BuildRequires: kernel-zfcpdump +BuildRequires: libcryptsetup-devel > 2.0.3 +BuildRequires: libjson-c-devel BuildRequires: libpfm-devel BuildRequires: ncurses-devel BuildRequires: net-snmp-devel @@ -380,14 +382,13 @@ export OPT_FLAGS="%{optflags}" export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}" make %{?_smp_mflags} \ ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \ - DISTRELEASE=%{release} \ - HAVE_CRYPTSETUP2=0 + DISTRELEASE=%{release} gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc %install mkdir -p %{buildroot}/boot/zipl mkdir -p %{buildroot}%{_sysconfdir}//zkey/repository -%make_install HAVE_CRYPTSETUP2=0 \ +%make_install \ ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \ DISTRELEASE=%{release} \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \