From 7b2017ddf7211140e03d9a7329fffc601cdacd6d Mon Sep 17 00:00:00 2001 From: Mohsin Kazmi Date: Wed, 26 Sep 2018 10:49:41 +0200 Subject: rpm: Fix the spec file to look into right directories Change-Id: If526e9f17226d7c371a8a98b9ac932196dab547a Signed-off-by: Mohsin Kazmi --- extras/rpm/vpp-suse.spec | 6 +++--- extras/rpm/vpp.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index 2830bd3e162..91e12baa63e 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -182,7 +182,7 @@ mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api # mkdir -p -m755 %{buildroot}%{_datadir}/vpp/api install -p -m 644 %{_vpp_install_dir}/vpp/share/vpp/api/core/*.api.json %{buildroot}%{_datadir}/vpp/api -install -p -m 644 %{_vpp_install_dir}/vpp/share/vpp/api/plugins/*.api.json %{buildroot}%{_datadir}/vpp/api + # # configs # @@ -197,7 +197,7 @@ install -p -m 644 %{_vpp_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}%{_s mkdir -p -m755 %{buildroot}%{_libdir} mkdir -p -m755 %{buildroot}%{_sysconfdir}/bash_completion.d mkdir -p -m755 %{buildroot}%{_datadir}/vpp -for file in $(find %{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print ) +for file in $(find %{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*' -print ) do install -p -m 755 $file %{buildroot}%{_libdir} done @@ -286,7 +286,7 @@ do %{buildroot}/%{_libdir}/vpp_api_test_plugins/$file done -for file in $(find %{_vpp_install_dir}/plugins -type f -name '*.api.json' -print ) +for file in $(find %{_vpp_install_dir}/vpp/share/vpp/api/plugins -type f -name '*.api.json' -print ) do install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api done diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index a66b46c5ae6..cd90a27494a 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -297,7 +297,7 @@ do %{buildroot}/usr/lib/vpp_api_test_plugins/$file done -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print ) +for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api/plugins -type f -name '*.api.json' -print ) do install -p -m 644 $file %{buildroot}/usr/share/vpp/api done -- cgit 1.2.3-korg