[packages/gettext] switch to %use_default_jdk

atler atler at pld-linux.org
Sun Jul 2 20:16:09 CEST 2023


commit b6d99a5b66ce9cc8e6670626eb952878e70d7469
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jul 2 19:25:33 2023 +0200

    switch to %use_default_jdk

 gettext.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index b2fc5f0..9873110 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -17,6 +17,7 @@
 %endif
 %if %{with javac}
 %undefine with_gcj
+%{?use_default_jdk}
 %endif
 %if %{without java}
 %undefine with_gcj
@@ -51,10 +52,8 @@ BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.13
 %{?with_gcj:BuildRequires:	gcc-java >= 3.0}
 %{!?with_bootstrap:BuildRequires:	glib2-devel >= 2.0}
-%if %{build_java}
-BuildRequires:	jar
-%endif
-%{?with_javac:BuildRequires:	jdk >= 1.6}
+%{?with_gcj:BuildRequires:	jar}
+%{?with_javac:%{?use_jdk:%buildrequires_jdk}%{!?use_jdk:BuildRequires:	jdk >= 1.6}}
 %{!?with_bootstrap:BuildRequires:	libcroco-devel >= 0.6.1}
 %if "%{cc_version}" >= "4.2"
 BuildRequires:	libgomp-devel
@@ -66,7 +65,7 @@ BuildRequires:	libunistring-devel
 %{?with_dotnet:BuildRequires:	mono-csharp}
 BuildRequires:	ncurses-devel
 %{?with_java:BuildRequires:	rpm-javaprov}
-BuildRequires:	rpmbuild(macros) >= 1.453
+BuildRequires:	rpmbuild(macros) >= 2.021
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
@@ -460,6 +459,7 @@ cd ../..
 %{__automake}
 %configure \
 	%{!?with_gcj:GCJ=none} \
+        %{?with_javac:JAVA="%{java_home}/bin/java" JAVAC="%{java_home}/bin/javac" JAR="%{java_home}/bin/jar"} \
 	%{?with_xemacs:--with-lispdir=%{_datadir}/xemacs-packages/lisp/po-mode} \
 	%{!?with_xemacs:--without-emacs} \
 	--enable-csharp=%{?with_dotnet:mono}%{!?with_dotnet:no} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/9f5746bc3c84c3f9f5b0dca7a8f6d7ec2e85cc48



More information about the pld-cvs-commit mailing list