From: Matthew Smith <mgsmith@netgate.com>
Date: Thu, 19 Jul 2018 13:37:03 +0000 (-0500)
Subject: dpdk: eliminate vpp-dpdk-devel RPM conflict
X-Git-Tag: v18.10-rc1~569
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=3a9702a05feb2e810ebd992d75fcee98b5888071;p=vpp.git

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 <mgsmith@netgate.com>
---

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