From c7830d9ec12b450d55cf3f94ca7522f7299c95d3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 02 2013 05:45:39 +0000
Subject: Remove dependencies on xerces-j2 and xml-commons-apis


---

diff --git a/ant.spec b/ant.spec
index c2ef6b6..b12d8d0 100644
--- a/ant.spec
+++ b/ant.spec
@@ -66,14 +66,10 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  junit
 BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
 %endif
 
 Requires:       jpackage-utils >= 0:1.7.5
 Requires:       java-devel >= 0:1.5.0
-%if %without bootstrap
-Requires:       xerces-j2
-%endif
 
 BuildArch:      noarch
 
@@ -363,6 +359,8 @@ Javadoc pour %{name}.
 #Fixup version
 find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 
+sed -i "s/ jaxp_parser_impl xml-commons-apis//" src/script/ant
+
 # When bootstrapping, we don't have junit
 %patch3 
 
@@ -379,7 +377,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java 
 
 #install jars
 %if %without bootstrap
-build-jar-repository -s -p lib/optional xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xml-commons-apis xalan-j2-serializer
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -392,7 +390,7 @@ mv LICENSE.utf8 LICENSE
 %if %without bootstrap
 %{ant} jars test-jar
 %if %{build_javadoc}
-export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
+export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
 %{ant} javadocs
 %endif
 %else
@@ -689,6 +687,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 - Remove Group tags
 - Update to current packaging guidelines
 - Run tests in %%check instead of %%build
+- Remove dependencies on xerces-j2 and xml-commons-apis
 
 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
 - Enable unit tests