quic: disable vnet_crypto and batching if no crypto engines are loaded

[vpp.git] / extras / rpm / vpp.spec

diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index cb847f2..726c9c4 100644 (file)
--- 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}
@@ -403,6 +414,9 @@ fi
 %files devel
 %defattr(-,bin,bin)
 /usr/bin/vppapigen
+/usr/bin/vapi_c_gen.py
+/usr/bin/vapi_cpp_gen.py
+/usr/bin/vapi_json_parser.py
 %{_includedir}/*
 /usr/share/doc/vpp/examples/sample-plugin
 /usr/share/vpp