summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2018-08-30 14:57:05 +0200
committerDamjan Marion <dmarion@me.com>2018-08-30 15:45:06 +0000
commit70fee2df339288d2c0a2a37ac8f497764df438c2 (patch)
tree8d4f2bee61079d4f1433519523e23f19857fea6b /extras
parent0923a2376fcdc07fc298b9422233f4a5c1777e7d (diff)
SUSE: fix spec to generate RPMs
Change-Id: I36ec5136d0f100c8277a19f89c8f6c9640e0614e Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/rpm/vpp-suse.spec54
1 files changed, 27 insertions, 27 deletions
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index e1b9bd73c9b..2eb5a4d55b9 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -125,17 +125,17 @@ 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-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
@@ -157,7 +157,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 vpp_uses_cmake=no 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}
@@ -226,11 +226,11 @@ do
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
+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}
@@ -257,11 +257,11 @@ 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;
+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
@@ -333,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_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