Actually honor with/without libimaevm option, doh

Also in rpm 4.14 imaevm support require ima-evm-utils >= 1.0
due to changed API.
This commit is contained in:
Panu Matilainen 2017-09-07 12:29:39 +03:00
parent 1dda23dab1
commit 37398b20d6

View File

@ -37,7 +37,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}1%{?dist} Release: %{?snapver:0.%{snapver}.}2%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@ -136,7 +136,7 @@ BuildRequires: libubsan
%endif %endif
%if %{with libimaevm} %if %{with libimaevm}
BuildRequires: ima-evm-utils BuildRequires: ima-evm-utils >= 1.0
%endif %endif
%description %description
@ -381,6 +381,7 @@ done;
--with-cap \ --with-cap \
--with-acl \ --with-acl \
%{?with_ndb: --with-ndb} \ %{?with_ndb: --with-ndb} \
%{?with_libimaevm: --with-imaevm} \
--enable-python \ --enable-python \
--with-crypto=openssl --with-crypto=openssl
@ -626,6 +627,10 @@ make check
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Thu Sep 07 2017 Panu Matilainen <pmatilai@redhat.com> - 4.14.0-0.rc1.2
- Actually honor with/without libimaevm option
- ima-evm-utis >= 1.0 is required for rpm >= 4.14.0
* Wed Sep 06 2017 Panu Matilainen <pmatilai@redhat.com> - 4.14.0-0.rc1.1 * Wed Sep 06 2017 Panu Matilainen <pmatilai@redhat.com> - 4.14.0-0.rc1.1
- Rebase to rpm 4.14.0-rc1 (http://rpm.org/wiki/Releases/4.14.0) - Rebase to rpm 4.14.0-rc1 (http://rpm.org/wiki/Releases/4.14.0)
- Re-enable SHA256 header digest generation (see #1480407) - Re-enable SHA256 header digest generation (see #1480407)