X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Frpm%2Fvpp.spec;h=726c9c42f287d36fa6836d453b15781d0e7e5bc5;hb=91fd910d7d7611a28d1f85482ed5d5c3ee6a8853;hp=e20bf1f8fad520e2d1fd48b755a95cda2fcdec4c;hpb=dc20371f83ed81462c0b24eb750b76f7819df64a;p=vpp.git diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index e20bf1f8fad..726c9c42f28 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -59,20 +59,26 @@ BuildRequires: python, python-devel, python-virtualenv, python-ply BuildRequires: python3, python36-devel, python3-virtualenv BuildRequires: cmake %else -%if 0%{rhel} == 7 +%if 0%{rhel} >= 7 Requires: epel-release Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python36 Requires: boost-filesystem mbedtls libffi-devel BuildRequires: epel-release BuildRequires: mbedtls-devel mbedtls -BuildRequires: devtoolset-7-toolchain BuildREquires: openssl-devel BuildRequires: python36-devel +%if 0%{rhel} == 7 +BuildRequires: devtoolset-7-toolchain BuildRequires: cmake3 +BuildRequires: glibc-static, yum-utils +%else +BuildRequires: cmake +BuildRequires: dnf-utils +%endif %endif %endif BuildRequires: libffi-devel -BuildRequires: glibc-static, yum-utils, redhat-lsb +BuildRequires: redhat-lsb BuildRequires: apr-devel BuildRequires: numactl-devel BuildRequires: autoconf automake libtool byacc bison flex @@ -152,7 +158,12 @@ This package contains the python3 bindings for the vpp api %package selinux-policy Summary: VPP Security-Enhanced Linux (SELinux) policy Group: System Environment/Base -Requires(post): selinux-policy-base >= %{selinux_policyver}, selinux-policy-targeted >= %{selinux_policyver}, policycoreutils, policycoreutils-python libselinux-utils +Requires(post): selinux-policy-base >= %{selinux_policyver}, selinux-policy-targeted >= %{selinux_policyver}, policycoreutils, libselinux-utils +%if 0%{rhel} < 8 +Requires(post): policycoreutils-python +%else +Requires(post): python3-policycoreutils +%endif %description selinux-policy This package contains a tailored VPP SELinux policy @@ -165,7 +176,7 @@ This package contains a tailored VPP SELinux policy groupadd -f -r vpp %build -%if 0%{?rhel} +%if 0%{rhel} < 8 . /opt/rh/devtoolset-7/enable %endif %if %{with aesni}