[packages/antlr] switch to %use_default_jdk and force use java 8; rel 19

atler atler at pld-linux.org
Wed Mar 11 20:14:14 CET 2026


commit 30f722cf481a8e985b093d31be31dea3e152245b
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Mar 11 20:13:49 2026 +0100

    switch to %use_default_jdk and force use java 8; rel 19

 antlr.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/antlr.spec b/antlr.spec
index 0760d38..d0d3a13 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -17,12 +17,15 @@
 %ifarch x32
 %undefine	with_dotnet
 %endif
+
+%{?use_default_jdk:%use_default_jdk 8}
+
 #
 Summary:	ANother Tool for Language Recognition
 Summary(pl.UTF-8):	Jeszcze jedno narzędzie do rozpoznawania języka
 Name:		antlr
 Version:	2.7.7
-Release:	18
+Release:	19
 License:	Public Domain
 Group:		Development/Tools
 Source0:	http://www.antlr2.org/download/%{name}-%{version}.tar.gz
@@ -38,13 +41,14 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 2.021
 BuildRequires:	sed >= 4.0
 %if %{with java}
 %if %{with gcj}
 BuildRequires:	java-gcj-compat-devel
 %else
 BuildRequires:	jar
-BuildRequires:	jdk
+%buildrequires_jdk
 Requires:	jpackage-utils
 %endif
 Requires:	jre
@@ -121,7 +125,7 @@ cp -f /usr/share/automake/config.sub scripts
 	%{?with_dotnet:CSHARPC=/usr/bin/mcs --enable-csharp} \
 	%{!?with_dotnet:--disable-csharp} \
 	--enable-cxx \
-	%{?with_java:CLASSPATH=`pwd` --with-java=java --with-javac=javac --with-jar=jar} \
+	%{?with_java:CLASSPATH=`pwd` --with-java="%{java_home}/bin/java" --with-javac="%{java_home}/bin/javac" --with-jar=jar} \
 	%{!?with_java:--disable-java} \
 
 CXXFLAGS="%{rpmcxxflags}" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/antlr.git/commitdiff/30f722cf481a8e985b093d31be31dea3e152245b



More information about the pld-cvs-commit mailing list