switch to %use_default_jdk and customize java bin paths

diff --git a/java-paths.patch b/java-paths.patch
new file mode 100644 (file)
index 0000000..c9973db
--- /dev/null
+++ b/java-paths.patch
@@ -0,0 +1,69 @@
+--- pdflib-4.0.3/bind/java/Makefile.in.orig    2023-07-07 13:17:05.446670459 +0200
++++ pdflib-4.0.3/bind/java/Makefile.in 2023-07-07 13:20:23.600863506 +0200
+@@ -15,6 +15,9 @@
+ CC            = @CC@
+ RM            = @RM@
+ LIBTOOL               = $(top_builddir)/libtool --silent
++JAVA          = java
++JAVAC         = javac
++JAR           = jar
+ prefix                = @prefix@
+ exec_prefix   = @exec_prefix@
+ 
+@@ -58,8 +61,8 @@
+ pdflib.jar: pdflib.java
+       $(RM) com
+       mkdir -p com/pdflib
+-      javac pdflib.java && mv pdflib.class com/pdflib
+-      jar cvf pdflib.jar com/pdflib/pdflib.class
++      $(JAVAC) pdflib.java && mv pdflib.class com/pdflib
++      $(JAR) cvf pdflib.jar com/pdflib/pdflib.class
+       $(RM) com
+ 
+ javadoc:
+@@ -68,31 +71,31 @@
+       -javadoc -notree -author -version -d javadoc -public pdflib.java
+ 
+ test: $(SWIG_LIB) pdflib.jar
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac hello.java
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) hello.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java hello
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac image.java
++          -dlopen $(SWIG_LIB) $(JAVA) hello
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) image.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java image
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac pdfclock.java
++          -dlopen $(SWIG_LIB) $(JAVA) image
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) pdfclock.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java pdfclock
++          -dlopen $(SWIG_LIB) $(JAVA) pdfclock
+ 
+ pditest: test 
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac personalize.java
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) personalize.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java personalize
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac quickreference.java
++          -dlopen $(SWIG_LIB) $(JAVA) personalize
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) quickreference.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java quickreference
++          -dlopen $(SWIG_LIB) $(JAVA) quickreference
+ 
+ ibmpditest: test 
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac personalize-ibm.java
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) personalize-ibm.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java personalize-ibm
+-      CLASSPATH=$$CLASSPATH:pdflib.jar:. javac quickreference-ibm.java
++          -dlopen $(SWIG_LIB) $(JAVA) personalize-ibm
++      CLASSPATH=$$CLASSPATH:pdflib.jar:. $(JAVAC) quickreference-ibm.java
+       CLASSPATH=$$CLASSPATH:pdflib.jar:. $(LIBTOOL) --mode=execute \
+-          -dlopen $(SWIG_LIB) java quickreference-ibm
++          -dlopen $(SWIG_LIB) $(JAVA) quickreference-ibm
+ 
+ install: $(SWIG_LIB) pdflib.jar
+       $(INSTALL) -d $(DESTDIR)$(LANG_LIBDIR)

diff --git a/pdflib.spec b/pdflib.spec
index bfa8b31dd588c76ccd00c1f18d551b08e5791437..12746619fe226b9be3624262d673455ca672d7e3 100644 (file)
--- a/pdflib.spec
+++ b/pdflib.spec
@@ -14,6 +14,8 @@
 
 %define                skip_post_check_so      pdflib_pl.so.0.0.0 pdflib_tcl.so.0.0.0 pdflib_py.so.0.0.0
 
+%{?with_java:%{?use_default_jdk}}
+
 Summary:       Portable C library for dynamically generating PDF files
 Summary(pl.UTF-8):     Przenośna biblioteka C do dynamicznego generowania plików PDF
 Name:          pdflib
@@ -32,10 +34,11 @@ Patch5:             %{name}-build.patch
 Patch6:                %{name}-libpng.patch
 Patch7:                format-security.patch
 Patch8:                %{name}-flags.patch
+Patch9:                java-paths.patch
 URL:           https://www.pdflib.com/
 BuildRequires: autoconf
 BuildRequires: automake
-%{?with_java:BuildRequires:    jdk >= 1.4}
+%{?with_java:%{?use_jdk:%buildrequires_jdk}%{!?use_jdk:BuildRequires:  jdk >= 1.4}}
 BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
@@ -44,7 +47,7 @@ BuildRequires:        python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.745
+BuildRequires: rpmbuild(macros) >= 2.021
 BuildRequires: tcl-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -155,6 +158,7 @@ Dowiązania pythona dla pdflib.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -174,7 +178,10 @@ Dowiązania pythona dla pdflib.
        --with-pnglib \
        --with-tifflib
 
-%{__make}
+%{__make} \
+       JAVA="%{java_home}/bin/java" \
+       JAVAC="%{java_home}/bin/javac" \
+       JAR="%{java_home}/bin/jar"
 
 %install
 rm -rf $RPM_BUILD_ROOT