[packages/gdal] small java related fixes; rel 19

[atler]

commit 070e0b6a66879cb4ef31eec7a42439b3e5272405
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 3 16:05:56 2023 +0200

    small java related fixes; rel 19

 gdal.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gdal.spec b/gdal.spec
index 27932ee..196e5e9 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/070e0b6a66879cb4ef31eec7a42439b3e5272405