X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Frpm%2Fvpp-suse.spec;h=042e17a0b4995f1fa19337494f31055bc299887e;hb=77100efb37f7cb333f9ab55dc206bf1431e3ae50;hp=3da2383218cc3567d515188278e0ebe93c85c01d;hpb=c76d6e2c4a659f3d142274561b50507e85412fca;p=vpp.git

diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index 3da2383218c..042e17a0b49 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -18,7 +18,7 @@
 
 %define _vpp_build_dir       %{buildroot}/../../BUILD/vpp-%{version}/build-root
 %define _vpp_install_dir     %{_vpp_build_dir}/install-vpp-native/
-%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib64
+%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib
 
 %define lname libvpp0
 
@@ -41,7 +41,6 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel
 BuildRequires:  glibc-devel-static
-BuildRequires:  java-devel >= 1.8
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libnuma-devel
@@ -125,18 +124,6 @@ Provides:       %{name}-any-api-lua = %{version}
 %description api-lua
 This package contains the lua bindings for the vpp api
 
-#%package api-java
-#Summary:        VPP api java bindings
-#Group:          Development/Libraries/Java
-#Requires:       %%{lname} = %%{version}
-#Requires:       %%{name} = %%{version}
-#Requires:       %%{name}-devel = %%{version}
-#Conflicts:      otherproviders(%%{name}-any-api-java)
-#Provides:       %%{name}-any-api-java = %%{version}
-
-#%description api-java
-#This package contains the java bindings for the vpp api
-
 %package api-python
 Summary:        VPP api python bindings
 Group:          Development/Libraries/Python
@@ -157,7 +144,7 @@ This package contains the python bindings for the vpp api
 export VPP_BUILD_USER=suse
 export VPP_BUILD_HOST=SUSE
 
-make V=1 PLATFORM=vpp build-release
+make -C build-root V=1 CC=gcc-7 CXX=g++-7 PLATFORM=vpp TAG=vpp install-packages
 
 cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build}
 
@@ -182,7 +169,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 +184,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
@@ -213,8 +200,6 @@ for file in $(find %{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.j
 do
         install -p -m 644 $file %{buildroot}%{_datadir}/vpp/api
 done
-install -p -m 644 %{_vpp_build_dir}/../src/scripts/vppctl_completion %{buildroot}%{_sysconfdir}/bash_completion.d
-install -p -m 644 %{_vpp_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}%{_datadir}/vpp
 
 # Lua bindings
 mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/lua/examples/cli
@@ -225,13 +210,6 @@ do
            %{buildroot}%{_datadir}/doc/vpp/examples/lua/$file
 done
 
-# Java bindings
-#mkdir -p -m755 %{buildroot}%{_datadir}/java
-#for file in $(find %{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print )
-#do
-#        install -p -m 644 $file %{buildroot}%{_datadir}/java
-#done
-
 # Python bindings
 cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_install}
 
@@ -245,7 +223,7 @@ chmod -x %{buildroot}%{python_sitelib}/vpp_papi/*.txt
 #
 # devel
 #
-for dir in $(find %{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in %{_vpp_install_dir}/{vom,vpp}/include/
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do
@@ -257,12 +235,6 @@ do
 	done
 done
 
-#mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
-#install -p -m755 %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
-#for i in $(ls %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do
-#   install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
-#done;
-
 # sample plugin
 mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/sample-plugin/sample
 for file in $(cd %{_vpp_install_dir}/../../sample-plugin && find -type f -print)
@@ -288,7 +260,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
@@ -321,8 +293,6 @@ export NO_BRP_CHECK_RPATH=true
 %dir %{_sysconfdir}/vpp
 %config %{_sysconfdir}/sysctl.d/80-vpp.conf
 %config %{_sysconfdir}/vpp/startup.conf
-%{_sysconfdir}/bash_completion.d/vppctl_completion
-%{_datadir}/vpp/vppctl-cmd-list
 %license LICENSE
 
 %files -n %{lname}
@@ -333,20 +303,14 @@ export NO_BRP_CHECK_RPATH=true
 %files api-lua
 %{_datadir}/doc/vpp/examples/lua
 
-#%files api-java
-#%%{_datadir}/java/*
-
 %files api-python
 %dir %{python_sitelib}/vpp_papi*
 %{python_sitelib}/vpp_papi*
 
 %files devel
-#%dir %{python_sitelib}/jvppgen
-#%{python_sitelib}/jvppgen/*
 %dir %{_datadir}/doc/vpp
 %dir %{_datadir}/doc/vpp/examples
 %{_libdir}/*.so
-#%{_bindir}/jvpp_gen.py
 %{_includedir}/*
 %{_datadir}/doc/vpp/examples/sample-plugin
 %dir %{_datadir}/vpp