[packages/vtk] fix without java build

glen glen at pld-linux.org
Wed May 18 10:07:30 CEST 2016


commit 98c8aeeccb8b81ba9c377bed7e556c044c469454
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 18 10:24:50 2016 +0300

    fix without java build

 vtk.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/vtk.spec b/vtk.spec
index 0d495f2..8321533 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -5,6 +5,7 @@
 # - CUDA for Accelerators/Piston (on bcond)
 # - NVCtrlLib for Rendering/OpenGL (on bcond)
 # - VTK_USE_SYSTEM_XDMF2=ON ? (but our xdmf-devel seems not compatible)
+# - python bcond?
 #
 # Conditional build
 %bcond_without	java		# Java wrappers
@@ -483,12 +484,14 @@ finance ; do
 done
 
 # Install test binaries
-for f in build/bin/*Tests build/bin/Test* build/bin/VTKBenchMark ; do
+for f in build/bin/*Tests build/bin/Test* build/bin/VTKBenchMark; do
 	install $f $RPM_BUILD_ROOT%{_bindir}
 done
 
-install build/bin/VTKJavaExecutable $RPM_BUILD_ROOT%{_bindir}
-install build/bin/vtkpython $RPM_BUILD_ROOT%{_bindir}
+%if %{with java}
+install -p build/bin/VTKJavaExecutable $RPM_BUILD_ROOT%{_bindir}
+%endif
+install -p build/bin/vtkpython $RPM_BUILD_ROOT%{_bindir}
 
 # unwanted doxygen files and misplaced verdict docs
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.3/{doxygen,verdict}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vtk.git/commitdiff/e21de9aded45beb3cdd991e4d952bdee62eff5af



More information about the pld-cvs-commit mailing list