From 3a9702a05feb2e810ebd992d75fcee98b5888071 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Thu, 19 Jul 2018 08:37:03 -0500 Subject: [PATCH] dpdk: eliminate vpp-dpdk-devel RPM conflict Both vpp-devel and vpp-dpdk-devel have /usr/include/dpdk in their files list. CentOS 7 won't allow them to both be installed at the same time as a result. Change vpp-dpdk-devel to /usr/include/dpdk/* so both can be installed. It is useful to have both installed on a development system. Change-Id: I94b6cca299dfbd991638e43c41006db0d8f7ee8b Signed-off-by: Matthew Smith --- dpdk/rpm/vpp-dpdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpdk/rpm/vpp-dpdk.spec b/dpdk/rpm/vpp-dpdk.spec index cc617681318..93e423584cb 100644 --- a/dpdk/rpm/vpp-dpdk.spec +++ b/dpdk/rpm/vpp-dpdk.spec @@ -20,7 +20,7 @@ make %{_make_args} install %files devel /usr/bin/* -/usr/include/dpdk +/usr/include/dpdk/* /usr/lib/* /usr/sbin/* /usr/share/dpdk -- 2.16.6