commit ff1761952c94848060dc13968ec693212b4aa223
Author: Jan Rękorajski <[email protected]>
Date: Fri Nov 16 10:23:36 2012 +0100
- set JAVA_HOME from rpm macros
vtk.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/vtk.spec b/vtk.spec
index 90dedac..b056b71 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -29,7 +29,10 @@ BuildRequires: gl2ps-devel
BuildRequires: gnuplot
BuildRequires: graphviz
BuildRequires: hdf5-devel
-%{?with_java:BuildRequires: jdk}
+%if %{with java}
+BuildRequires: jdk
+BuildRequires: jpackage-utils
+%endif
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtheora-devel
@@ -219,7 +222,7 @@ find vtk-examples -type f | xargs chmod -R a-x
export CFLAGS="%{optflags} -D_UNICODE"
export CXXFLAGS="%{optflags} -D_UNICODE"
%if %{with java}
-export JAVA_HOME=/usr/lib/jvm/java
+export JAVA_HOME=%{java_home}
%endif
mkdir build
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vtk.git/commitdiff/40fb768e6330efe14d349ad0d086660ce40d6946
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
