diff options
| author | Jan Palus | 2023-07-06 23:19:23 (GMT) |
|---|---|---|
| committer | Jan Palus | 2023-07-06 23:19:23 (GMT) |
| commit | dc1b7678c8d86dce3d8b2f3d9561d5766ee57669 (patch) | |
| tree | dfd2d84be636a0074de7a06dc8b0b48179793f3f /graphviz.spec | |
| parent | cf8d8ff19828d8d257d5096935b3ef80136a490d (diff) | |
| download | graphviz-dc1b7678c8d86dce3d8b2f3d9561d5766ee57669.zip graphviz-dc1b7678c8d86dce3d8b2f3d9561d5766ee57669.tar.gz | |
graphviz ignores $JAVA_HOME so use fixed paths
Diffstat (limited to 'graphviz.spec')
| -rw-r--r-- | graphviz.spec | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/graphviz.spec b/graphviz.spec index fbe094a..fc865cf 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -73,6 +73,7 @@ Patch10: %{name}-ming.patch Patch12: %{name}-webp.patch Patch14: python-paths.patch Patch15: ghostscript918.patch +Patch16: java.patch URL: http://www.graphviz.org/ %{?with_devil:BuildRequires: DevIL-devel} %{?with_r:BuildRequires: R} @@ -528,6 +529,7 @@ Wiązania graphviza dla języka R. %patch12 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua5.1@' -i tclpkg/gv/demo/modgraph.lua @@ -544,9 +546,7 @@ touch config/config.rpath CPPFLAGS="%{rpmcppflags}" %if %{with java} -JAVA_HOME=%{java_home} -export JAVA_HOME -CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" +CPPFLAGS="$CPPFLAGS -I%{java_home}/include -I%{java_home}/include/linux" %endif export CPPFLAGS @@ -557,6 +557,10 @@ export CPPFLAGS %ifarch x32 LIBPOSTFIX="x32" \ %endif +%if %{with java} + JAVA="%{java_home}/bin/java}" \ + JAVAC="%{java_home}/bin/javac}" \ +%endif LUA=/usr/bin/lua5.1 \ PHP=%{__php} \ %{?with_ruby:RUBY_VER=%{ruby_abi}} \ |