[packages/pdflib-lite] customize java binary paths

[atler]

commit 9dc25b72f1fdd08e0bec0e177d56342b86a22000
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jul 7 13:04:51 2023 +0200

    customize java binary paths

 java-compat.patch | 27 +++++++++++++++++++++++++++
 java-paths.patch  | 27 +++++++++++++++++++++++++++
 pdflib-lite.spec  |  9 +++++++--
 3 files changed, 61 insertions(+), 2 deletions(-)
---
diff --git a/pdflib-lite.spec b/pdflib-lite.spec
index fecb8a5..2f5c168 100644
--- a/pdflib-lite.spec
+++ b/pdflib-lite.spec
@@ -36,6 +36,7 @@ Patch5:		%{name}-libtool.patch
 Patch6:		%{name}-system-libs.patch
 Patch7:		%{name}-shared.patch
 Patch8:		java-compat.patch
+Patch9:		java-paths.patch
 URL:		https://www.pdflib.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -230,6 +231,7 @@ Wiązania Tcl-a do biblioteki PDFlib Lite.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %{?with_system_zlib:%{__rm} -r libs/flate}
 %{?with_system_zlib:%{__sed} -i -e '/\/flate\// d' libs/pdflib/Make_objs2.inc}
@@ -275,7 +277,10 @@ Wiązania Tcl-a do biblioteki PDFlib Lite.
 	--without-tcl
 %endif
 
-%{__make}
+%{__make} \
+	JAVA_EXE="%{java_home}/bin/java" \
+	JAVAC_EXE="%{java_home}/bin/javac" \
+	JAR="%{java_home}/bin/jar"
 
 %if %{with cxx}
 cd bind/pdflib/cpp
@@ -284,7 +289,7 @@ cd ../../..
 %endif
 
 %if %{with java}
-%{__make} -C bind/pdflib/java javadoc
+%{__make} JAVADOC="%{java_home}/bin/javadoc" -C bind/pdflib/java javadoc
 %endif
 
 %if %{with perl}
diff --git a/java-compat.patch b/java-compat.patch
index 07d686a..8e37464 100644
--- a/java-compat.patch
+++ b/java-compat.patch
@@ -9,3 +9,30 @@
  
  case $ac_sys_system in
      dnl TODO: check if this is still true
+--- PDFlib-Lite-7.0.5p3/bind/pdflib/java/Makefile.orig	2023-07-07 12:22:30.249421576 +0200
++++ PDFlib-Lite-7.0.5p3/bind/pdflib/java/Makefile	2023-07-07 12:59:52.953380916 +0200
+@@ -3,10 +3,13 @@
+ 
+ top_builddir	= ../../..
+ MYJAR   = pdflib.jar
+-JAVAC   = javac -classpath $(MYJAR):.
++JAVAC_EXE = javac
++JAVAC   = $(JAVAC_EXE) -classpath $(MYJAR):.
+ COMPILE = $(JAVAC) $(JAVACFLAGS)
+-JAVA    = $(LIBTOOL_EXE) java -classpath $(MYJAR):.
++JAVA_EXE    = java
++JAVA    = $(LIBTOOL_EXE) $(JAVA_EXE) -classpath $(MYJAR):.
+ JAR     = jar
++JAVADOC     = javadoc
+ 
+ include ../../../config/mkcommon.inc
+ 
+@@ -76,7 +79,7 @@
+ javadoc::
+ 	$(RM) javadoc
+ 	$(MKDIR) javadoc
+-	-javadoc -notree -author -version -d javadoc -public \
++	-$(JAVADOC) -notree -author -version -d javadoc -public \
+ 	    pdflib.java PDFlibException.java
+ 
+ test:: $(LIBNAME) pdflib.jar $(TESTPROGS)
diff --git a/java-paths.patch b/java-paths.patch
new file mode 100644
index 0000000..e608bef
--- /dev/null
+++ b/java-paths.patch
@@ -0,0 +1,27 @@
+--- PDFlib-Lite-7.0.5p3/bind/pdflib/java/Makefile.orig	2023-07-07 12:22:30.249421576 +0200
++++ PDFlib-Lite-7.0.5p3/bind/pdflib/java/Makefile	2023-07-07 12:59:52.953380916 +0200
+@@ -3,10 +3,13 @@
+ 
+ top_builddir	= ../../..
+ MYJAR   = pdflib.jar
+-JAVAC   = javac -classpath $(MYJAR):.
++JAVAC_EXE = javac
++JAVAC   = $(JAVAC_EXE) -classpath $(MYJAR):.
+ COMPILE = $(JAVAC) $(JAVACFLAGS)
+-JAVA    = $(LIBTOOL_EXE) java -classpath $(MYJAR):.
++JAVA_EXE    = java
++JAVA    = $(LIBTOOL_EXE) $(JAVA_EXE) -classpath $(MYJAR):.
+ JAR     = jar
++JAVADOC     = javadoc
+ 
+ include ../../../config/mkcommon.inc
+ 
+@@ -76,7 +79,7 @@
+ javadoc::
+ 	$(RM) javadoc
+ 	$(MKDIR) javadoc
+-	-javadoc -notree -author -version -d javadoc -public \
++	-$(JAVADOC) -notree -author -version -d javadoc -public \
+ 	    pdflib.java PDFlibException.java
+ 
+ test:: $(LIBNAME) pdflib.jar $(TESTPROGS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pdflib-lite.git/commitdiff/9dc25b72f1fdd08e0bec0e177d56342b86a22000