small java related fixes; rel 19

diff --git a/gdal.spec b/gdal.spec
index 27932eeafd089178d9268aa3bf90fb7ad55cfa5f..196e5e9dcc383e46365348f68f62cffd4d7ded6e 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -53,7 +53,7 @@ Summary:      Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
 Version:       3.0.4
-Release:       18
+Release:       19
 License:       BSD-like
 Group:         Libraries
 Source0:       https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -147,7 +147,7 @@ BuildRequires:      xz-devel
 BuildRequires: zlib-devel >= 1.1.4
 # for ZSTD compression in TIFF
 BuildRequires: zstd-devel
-%{?with_java:Requires:  %{use_jdk}-jre-base}
+%{?with_java:Requires:  %{?use_jdk:%{use_jdk}-jre-base}%{!?use_jdk:jre}}
 Requires:      freexl >= 1.0
 Requires:      geos >= 3.1.0
 Requires:      hdf >= 4.2.5
@@ -348,6 +348,7 @@ for jvm_type in server client; do
        for dir in lib jre/lib/$jvm_arch; do
                if [ -f "%{java_home}/$dir/$jvm_type/libjvm.so" ]; then
                        jvm_lib="%{java_home}/$dir/$jvm_type"
+                       break
                fi
        done
 done