[packages/tzdata] switch to %use_default_jdk

atler atler at pld-linux.org
Fri Mar 24 13:55:16 CET 2023


commit dc572f5d32677aee82bb30302c7b39bb0b3e4a62
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Mar 24 13:51:14 2023 +0100

    switch to %use_default_jdk

 tzdata.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/tzdata.spec b/tzdata.spec
index 67f4597..c6fa008 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -15,6 +15,10 @@
 %endif
 %endif
 
+%if %{with java}
+%{?use_default_jdk}
+%endif
+
 Summary:	Timezone data
 Summary(pl.UTF-8):	Dane o strefach czasowych
 Name:		tzdata
@@ -37,7 +41,7 @@ BuildRequires:	lzip
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.623
 %if %{with java}
-BuildRequires:	jdk
+%{?use_jdk:%buildrequires_jdk}%{!?use_jdk:BuildRequires:	jdk}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tzdata.git/commitdiff/0aaa57aed30658fa439916e95430843641d520ad



More information about the pld-cvs-commit mailing list