rpms/graphviz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix %java_home detection

Browse Source 
javapackages-tools is required to define %java_home, and the configure
hack needs updating for the current syntax of that file.
This commit is contained in:
Yaakov Selkowitz 2023-10-17 16:33:23 -04:00
parent fc03bdd065
commit 83ca194af0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphviz.spec
View File

@ -141,6 +141,7 @@ BuildRequires: libSM-devel
BuildRequires: libXext-devel
%if %{JAVA}
BuildRequires: java-devel
BuildRequires: javapackages-tools
%endif
BuildRequires: cairo-devel >= 1.1.10
BuildRequires: pango-devel
@ -421,8 +422,7 @@ autoreconf -fi
%if %{JAVA}
# Hack in the java includes we need
sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure
sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure
sed -i 's|for try_java_include in|& %{java_home}/include/ %{java_home}/include/linux/|' configure
%endif
# Rewrite config_ruby.rb to work with Ruby 2.2
sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb