[packages/openconnect] switch to %use_default_jdk

atler atler at pld-linux.org
Mon Nov 20 03:39:26 CET 2023


commit 812acebc79a7281c6403a5e6ddd9b8a7c479a00f
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Nov 20 01:48:45 2023 +0100

    switch to %use_default_jdk

 openconnect.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/openconnect.spec b/openconnect.spec
index d412e6d..201695b 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -8,6 +8,9 @@
 %bcond_without	stoken		# Software Token authentication
 %bcond_without	static_libs	# static library
 #
+
+%{?with_java:%{?use_default_jdk}}
+
 Summary:	Client for Cisco's AnyConnect SSL VPN and Pulse Connect Secure
 Summary(pl.UTF-8):	Klient Cisco AnyConnect SSL VPN i Pulse Connect Secure
 Name:		openconnect
@@ -25,7 +28,7 @@ BuildRequires:	automake >= 1:1.10
 %{!?with_openssl:BuildRequires:	gnutls-devel >= 3.6.13}
 BuildRequires:	groff
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
-%{?with_java:BuildRequires:	jdk}
+%{?with_java:%buildrequires_jdk}
 %{?with_openssl:BuildRequires:	libp11-devel >= 0.4.8}
 BuildRequires:	libproxy-devel
 %{!?with_openssl:BuildRequires:	libtasn1-devel}
@@ -38,7 +41,7 @@ BuildRequires:	p11-kit-devel
 BuildRequires:	pkgconfig >= 1:0.27
 BuildRequires:	python >= 2
 BuildRequires:	rpm-build >= 4.6
-BuildRequires:	rpmbuild(macros) >= 1.673
+BuildRequires:	rpmbuild(macros) >= 2.021
 %{?with_stoken:BuildRequires:	stoken-devel}
 %{!?with_openssl:BuildRequires:	tpm2-tss-devel}
 %{!?with_openssl:BuildRequires:	trousers-devel}
@@ -120,6 +123,7 @@ Bashowe dopełnianie argumentów polecenia openconnect.
 %patch1 -p1
 
 %build
+%{?with_java:export JAVA_HOME="%{java_home}"}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openconnect.git/commitdiff/812acebc79a7281c6403a5e6ddd9b8a7c479a00f



More information about the pld-cvs-commit mailing list