Since -core suffix was removed from the package names in commit
6f2760ecdf4e, the file name should also be updated.
The alignment of build commands is also changed to prepare next patch.

Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
---
 pkg/{dpdk-core.spec => dpdk.spec} | 48 +++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
 rename pkg/{dpdk-core.spec => dpdk.spec} (71%)

diff --git a/pkg/dpdk-core.spec b/pkg/dpdk.spec
similarity index 71%
rename from pkg/dpdk-core.spec
rename to pkg/dpdk.spec
index 76ae701..9a92e95 100644
--- a/pkg/dpdk-core.spec
+++ b/pkg/dpdk.spec
@@ -88,30 +88,30 @@ make O=%{target} doc

 %install
 rm -rf %{buildroot}
-make           O=%{target}     DESTDIR=%{destdir}
-mkdir -p                               %{buildroot}%{moddir}
-mv    %{destdir}/%{target}/kmod/*.ko   %{buildroot}%{moddir}
-rmdir %{destdir}/%{target}/kmod
-mkdir -p                               %{buildroot}%{_sbindir}
-ln -s %{datadir}/tools/*nic_bind.py    %{buildroot}%{_sbindir}/dpdk_nic_bind
-mkdir -p                               %{buildroot}%{_bindir}
-mv    %{destdir}/%{target}/app/testpmd %{buildroot}%{_bindir}
-rmdir %{destdir}/%{target}/app
-mv    %{destdir}/%{target}/include     %{buildroot}%{_includedir}
-mv    %{destdir}/%{target}/lib         %{buildroot}%{_libdir}
-mkdir -p                               %{buildroot}%{docdir}
-mv    %{destdir}/%{target}/doc/*       %{buildroot}%{docdir}
-rmdir %{destdir}/%{target}/doc
-mkdir -p                               %{buildroot}%{datadir}
-mv    %{destdir}/%{target}/.config     %{buildroot}%{datadir}/config
-mv    %{destdir}/%{target}             %{buildroot}%{datadir}
-mv    %{destdir}/scripts               %{buildroot}%{datadir}
-mv    %{destdir}/mk                    %{buildroot}%{datadir}
-cp -a            examples              %{buildroot}%{datadir}
-cp -a            tools                 %{buildroot}%{datadir}
-ln -s            %{datadir}/config     %{buildroot}%{datadir}/%{target}/.config
-ln -s            %{_includedir}        %{buildroot}%{datadir}/%{target}/include
-ln -s            %{_libdir}            %{buildroot}%{datadir}/%{target}/lib
+make            O=%{target}      DESTDIR=%{destdir}
+mkdir -p                                 %{buildroot}%{moddir}
+mv     %{destdir}/%{target}/kmod/*.ko    %{buildroot}%{moddir}
+rmdir  %{destdir}/%{target}/kmod
+mkdir -p                                 %{buildroot}%{_sbindir}
+ln -s  %{datadir}/tools/*nic_bind.py     %{buildroot}%{_sbindir}/dpdk_nic_bind
+mkdir -p                                 %{buildroot}%{_bindir}
+mv     %{destdir}/%{target}/app/testpmd  %{buildroot}%{_bindir}
+rmdir  %{destdir}/%{target}/app
+mv     %{destdir}/%{target}/include      %{buildroot}%{_includedir}
+mv     %{destdir}/%{target}/lib          %{buildroot}%{_libdir}
+mkdir -p                                 %{buildroot}%{docdir}
+mv     %{destdir}/%{target}/doc/*        %{buildroot}%{docdir}
+rmdir  %{destdir}/%{target}/doc
+mkdir -p                                 %{buildroot}%{datadir}
+mv     %{destdir}/%{target}/.config      %{buildroot}%{datadir}/config
+mv     %{destdir}/%{target}              %{buildroot}%{datadir}
+mv     %{destdir}/scripts                %{buildroot}%{datadir}
+mv     %{destdir}/mk                     %{buildroot}%{datadir}
+cp -a             examples               %{buildroot}%{datadir}
+cp -a             tools                  %{buildroot}%{datadir}
+ln -s             %{datadir}/config      
%{buildroot}%{datadir}/%{target}/.config
+ln -s             %{_includedir}         
%{buildroot}%{datadir}/%{target}/include
+ln -s             %{_libdir}             %{buildroot}%{datadir}/%{target}/lib

 %files
 %dir %{datadir}
-- 
2.2.2

Reply via email to