[packages/ant] xerces is optional too

atler atler at pld-linux.org
Wed Mar 11 18:55:22 CET 2026


commit cb3b2980d04472c6fd1648c051764eb4a5304b73
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Mar 11 16:40:31 2026 +0100

    xerces is optional too
    
    jaxp_parser_impl dependency no longer needed as it's part of java >= 1.5
    while package requires java 8

 ant.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index a2b9ba6..71259b0 100644
--- a/ant.spec
+++ b/ant.spec
@@ -83,7 +83,7 @@ URL:		https://ant.apache.org/
 %{?with_netrexx:BuildRequires:	java-netrexx}
 %{?with_apache_oro:BuildRequires:	java-oro}
 %{?with_apache_regexp:BuildRequires:	java-regexp}
-BuildRequires:	java-xerces
+%{?with_apache_resolver:BuildRequires:	java-xerces}
 %{?with_apache_resolver:BuildRequires:	java-xml-commons-resolver}
 %buildrequires_jdk
 BuildRequires:	jpackage-utils
@@ -92,7 +92,6 @@ BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 2.021
-Requires:	java(jaxp_parser_impl)
 Requires:	java(xml-commons-apis)
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant < 1.6.5-2
@@ -522,7 +521,6 @@ find . -name "*.jar" -exec rm -f {} \;
 %build
 export JAVA_HOME="%{java_home}"
 
-required_jars="jaxp_parser_impl"
 %{?with_junit:required_jars="$required_jars junit"}
 %{?with_antlr:required_jars="$required_jars antlr"}
 %{?with_apache_bsf:required_jars="$required_jars bsf jython bsh"}
@@ -539,7 +537,7 @@ required_jars="jaxp_parser_impl"
 %{?with_jsch:required_jars="$required_jars jsch"}
 %{?with_netrexx:required_jars="$required_jars NetRexxC"}
 
-build-jar-repository lib/optional $required_jars
+test -n "$required_jars" && build-jar-repository lib/optional $required_jars
 
 export SHELL=/bin/sh
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ant.git/commitdiff/b28e9908ab2dacbea8922aff23c20bb37439dbad



More information about the pld-cvs-commit mailing list