graphviz ignores $JAVA_HOME so use fixed paths

diff --git a/graphviz.spec b/graphviz.spec
index fbe094ad1e8c8b457735caf74a2280195fd589f2..fc865cf4c9afe6c631ff23068fd18a4bd5905a82 100644 (file)
--- 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
 
@@ -556,6 +556,10 @@ export CPPFLAGS
 %endif
 %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} \

diff --git a/java.patch b/java.patch
new file mode 100644 (file)
index 0000000..afea261
--- /dev/null
+++ b/java.patch
@@ -0,0 +1,32 @@
+--- graphviz-2.47.2/configure.ac.orig  2023-07-07 00:56:28.786941939 +0200
++++ graphviz-2.47.2/configure.ac       2023-07-07 01:11:13.505632331 +0200
+@@ -808,6 +808,7 @@
+       use_java="No (swig does not support -java option)"
+     else
+       AC_CHECK_PROG(JAVA,java,java)
++      AC_CHECK_PROG(JAVAC,javac,javac)
+       if test "x$JAVA" = "x"; then
+         use_java="No (java not available)"
+       else
+--- graphviz-2.47.2/tclpkg/gv/Makefile.am.orig 2021-05-27 02:56:40.000000000 +0200
++++ graphviz-2.47.2/tclpkg/gv/Makefile.am      2023-07-07 01:10:42.433234989 +0200
+@@ -535,7 +535,7 @@
+ endif
+ install-data-hook:
+ if WITH_JAVA
+-      (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;)
++      (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); $(JAVAC) -classpath $(DESTDIR)$(libjavadir) gv.java;)
+ endif
+ if WITH_LUA
+       (cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
+@@ -603,8 +603,8 @@
+               ln -f ../$(srcdir)/test.java .; \
+               ln -f ../$(srcdir)/hello.gv  .; \
+               ln -f ../$(srcdir)/test.java .; \
+-              CLASSPATH=. javac *.java; \
+-              LD_LIBRARY_PATH=. CLASSPATH=. java test)
++              CLASSPATH=. $(JAVAC) *.java; \
++              LD_LIBRARY_PATH=. CLASSPATH=. $(JAVA) test)
+ 
+ .PHONY: test_lua
+ test_lua: libgv_lua.la