X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Frpm%2Fvpp-suse.spec;h=3da2383218cc3567d515188278e0ebe93c85c01d;hb=0e10dd17b66736ac604f8e85ba17c202c893fb28;hp=2649081d5e934698cba44c63e706740b8a4636aa;hpb=a5ee900fb75201bbfceaf13c8bc57a13ed094988;p=vpp.git

diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index 2649081d5e9..3da2383218c 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package vpp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,17 +38,23 @@ BuildRequires:  check-devel
 BuildRequires:  chrpath
 BuildRequires:  distribution-release
 BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
 BuildRequires:  glibc-devel-static
-BuildRequires:  java-1_8_0-openjdk-devel
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  libboost_headers-devel
+BuildRequires:  libboost_thread-devel
 BuildRequires:  libnuma-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
 BuildRequires:  lsb-release
 BuildRequires:  make
+BuildRequires:  mbedtls-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  python-pip
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-ply
 BuildRequires:  python3-devel
 BuildRequires:  python3-pip
 BuildRequires:  shadow
@@ -112,28 +118,31 @@ Summary:        VPP api lua bindings
 Group:          Development/Libraries/Other
 Requires:       %{lname} = %{version}
 Requires:       %{name} = %{version}
+Requires:       %{name}-devel = %{version}
 Conflicts:      otherproviders(%{name}-any-api-lua)
 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}
-Conflicts:      otherproviders(%{name}-any-api-java)
-Provides:       %{name}-any-api-java = %{version}
+#%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
+#%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
 Requires:       %{lname} = %{version}
 Requires:       %{name} = %{version}
+Requires:       %{name}-devel = %{version}
 Requires:       python-setuptools
 Conflicts:      otherproviders(%{name}-any-python-api)
 Provides:       %{name}-any-python-api = %{version}
@@ -148,7 +157,6 @@ 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 bootstrap
 make V=1 PLATFORM=vpp build-release
 
 cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build}
@@ -218,11 +226,11 @@ do
 done
 
 # Java bindings
-mkdir -p -m755 %{buildroot}%{_datadir}/java
-for file in $(find %{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
-do
-        install -p -m 644 $file %{buildroot}%{_datadir}/java
-done
+#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}
@@ -249,11 +257,11 @@ do
 	done
 done
 
-mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
-install -p -m755 %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
-for i in $(ls %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
-   install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
-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
@@ -315,7 +323,7 @@ export NO_BRP_CHECK_RPATH=true
 %config %{_sysconfdir}/vpp/startup.conf
 %{_sysconfdir}/bash_completion.d/vppctl_completion
 %{_datadir}/vpp/vppctl-cmd-list
-%doc LICENSE
+%license LICENSE
 
 %files -n %{lname}
 %exclude %{_libdir}/vpp_plugins
@@ -325,20 +333,20 @@ export NO_BRP_CHECK_RPATH=true
 %files api-lua
 %{_datadir}/doc/vpp/examples/lua
 
-%files api-java
-%{_datadir}/java/*
+#%files api-java
+#%%{_datadir}/java/*
 
 %files api-python
 %dir %{python_sitelib}/vpp_papi*
-%{python_sitelib}/vpp_*
+%{python_sitelib}/vpp_papi*
 
 %files devel
-%dir %{python_sitelib}/jvppgen
-%{python_sitelib}/jvppgen/*
+#%dir %{python_sitelib}/jvppgen
+#%{python_sitelib}/jvppgen/*
 %dir %{_datadir}/doc/vpp
 %dir %{_datadir}/doc/vpp/examples
 %{_libdir}/*.so
-%{_bindir}/jvpp_gen.py
+#%{_bindir}/jvpp_gen.py
 %{_includedir}/*
 %{_datadir}/doc/vpp/examples/sample-plugin
 %dir %{_datadir}/vpp