!41 [sync] PR-40: fix yum update dpdk-tools conflict with dpdk-devel

From: @openeuler-sync-bot
Reviewed-by: @hubble_zhu,@LemmyHuang
Signed-off-by: @hubble_zhu,@LemmyHuang
This commit is contained in:
openeuler-ci-bot 2021-01-30 16:36:09 +08:00 committed by Gitee
commit 86c23a41b4

View File

@ -1,6 +1,6 @@
Name: dpdk
Version: 19.11
Release: 5
Release: 6
Packager: packaging@6wind.com
URL: http://dpdk.org
%global source_version 19.11
@ -151,6 +151,7 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko
%dir %{_datadir}/dpdk
%{_datadir}/dpdk/usertools/*.py
%{_datadir}/dpdk/usertools/*.sh
%{_sbindir}/dpdk-devbind
/lib/modules/%{kern_devel_ver}/extra/dpdk/*
/lib64/librte*.so*
@ -160,13 +161,13 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko
%{_datadir}/dpdk/buildtools
%{_datadir}/dpdk/%{target}
%{_datadir}/dpdk/examples
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/*
%dir /usr/include/%{name}-%{version}/
/usr/include/%{name}-%{version}/*
%dir /usr/include/dpdk/
/usr/include/dpdk/*
%exclude /usr/bin/dpdk-pdump
%files doc
#%doc %{_docdir}/dpdk
@ -183,7 +184,10 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko
/usr/sbin/depmod
%changelog
* Mon Nov 2 2020 zhaowei<zhaowei23@huawei.com> - 19.11-5
* Thu Jan 28 2021 huangliming<huangliming5@huawei.com> - 19.11-6
-fix yum update dpdk-tools conflict with dpdk-devel
* Tue Oct 20 2020 zhaowei<zhaowei23@huawei.com> - 19.11-5
-fix CVE-2020-14374 CVE-2020-14375
* Tue Oct 20 2020 chenxiang<rose.chen@huawei.com> - 19.11-4