[packages/libguestfs] switch to %use_default_jdk

atler atler at pld-linux.org
Tue Jun 13 18:28:06 CEST 2023


commit 0a000f5378a75aab6f6e85601e418e033cd16176
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jun 13 13:33:23 2023 +0200

    switch to %use_default_jdk

 libguestfs.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 3c1e84b..892ef24 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -32,6 +32,8 @@
 %undefine	with_golang
 %endif
 
+%{?with_java:%{?use_default_jdk}}
+
 Summary:	Library and tools for accessing and modifying virtual machine disk images
 Summary(pl.UTF-8):	Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych
 Name:		libguestfs
@@ -85,7 +87,7 @@ BuildRequires:	qemu-img >= 1.0
 BuildRequires:	readline-devel
 BuildRequires:	rpcsvc-proto
 BuildRequires:	rpm-devel >= 4.6.0
-BuildRequires:	rpmbuild(macros) >= 2.009
+BuildRequires:	rpmbuild(macros) >= 2.021
 BuildRequires:	sleuthkit-devel
 # libsystemd-journal
 BuildRequires:	systemd-devel >= 1:196
@@ -105,7 +107,7 @@ BuildRequires:	golang
 BuildRequires:	ghc
 %endif
 %if %{with java}
-BuildRequires:	jdk
+%{?use_jdk:%buildrequires_jdk}%{!?use_jdk:BuildRequires:  jdk}
 BuildRequires:	rpm-javaprov
 %endif
 %if %{with lua}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libguestfs.git/commitdiff/2b971596b90982ef21ae67b5b05e2128458746ad



More information about the pld-cvs-commit mailing list