From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 19 Sep 2016 20:10:53 +0000 (-0700)
Subject: Fix rpm packaging to usr /usr/lib not /usr/lib64
X-Git-Tag: v16.09^0
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fstable%2F1609;p=nsh_sfc.git

Fix rpm packaging to usr /usr/lib not /usr/lib64

Change-Id: Ia81728881de048690ddadc1ee4ec7dd34d7c6655
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec b/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec
index c114200..f8e31c7 100644
--- a/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec
+++ b/nsh-plugin/packaging/rpm/vpp-nsh-plugin.spec
@@ -23,10 +23,10 @@ This package contains the headers for C bindings for the vpp-nsh-plugin
 #
 # vpp-nsh-plugin
 #
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_plugins
-install -m 644 %{_plugin_prefix}/lib/vpp_plugins/nsh_plugin.so %{buildroot}%{_libdir}/vpp_plugins/nsh_plugin.so
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_api_test_plugins
-install -m 644 %{_plugin_prefix}/lib/vpp_api_test_plugins/nsh_test_plugin.so %{buildroot}%{_libdir}/vpp_api_test_plugins/nsh_test_plugin.so
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
+install -m 644 %{_plugin_prefix}/lib/vpp_plugins/nsh_plugin.so %{buildroot}/usr/lib/vpp_plugins/nsh_plugin.so
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
+install -m 644 %{_plugin_prefix}/lib/vpp_api_test_plugins/nsh_test_plugin.so %{buildroot}/usr/lib/vpp_api_test_plugins/nsh_test_plugin.so
 
 # 
 # vpp-nsh-plugin-devel
@@ -39,8 +39,8 @@ install -m 644 %{_plugin_prefix}/include/vpp-api/nsh.api.h %{buildroot}%{_includ
 
 %files
 %defattr(-,bin,bin)
-%{_libdir}/vpp_plugins/nsh_plugin.so
-%{_libdir}/vpp_api_test_plugins/nsh_test_plugin.so
+/usr/lib/vpp_plugins/nsh_plugin.so
+/usr/lib/vpp_api_test_plugins/nsh_test_plugin.so
 
 %files devel
 %defattr(-,bin,bin)