diff --git a/ant.spec b/ant.spec index 77dc7f6..361342b 100644 --- a/ant.spec +++ b/ant.spec @@ -36,7 +36,7 @@ Name: ant Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java @@ -55,11 +55,15 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: junit BuildRequires: xalan-j2 +BuildRequires: xerces-j2 +BuildRequires: xml-commons-apis Requires: jpackage-utils >= 0:1.7.5 Requires: java-devel >= 0:1.5.0 Requires: perl Requires: python +Requires: xerces-j2 +Requires: xml-commons-apis Obsoletes: %{name}-scripts < %{epoch}:%{version}-%{release} Provides: %{name}-scripts = %{epoch}:%{version}-%{release} @@ -320,7 +324,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 +# Temporarily commented out, see #994556 +# sed -i "s/ jaxp_parser_impl xml-commons-apis//" src/script/ant # Fix class-path-in-manifest rpmlint warning %patch4 @@ -336,7 +341,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java src/tests/junit/org/apache/tools/mail/MailMessageTest.java #install jars -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 +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 xerces-j2 xml-commons-apis # Fix file-not-utf8 rpmlint warning iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 @@ -348,7 +353,7 @@ mv LICENSE.utf8 LICENSE %{ant} jars test-jar %if %with javadoc -export CLASSPATH=$(build-classpath 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 xerces-j2 xml-commons-apis) %{ant} javadocs %endif @@ -597,6 +602,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Thu Aug 08 2013 Michal Srb - 0:1.9.2-4 +- Temporarily add xerces-j2 and xml-commons-apis to classpath, see #994556 + * Fri Jul 26 2013 Mikolaj Izdebski - 0:1.9.2-3 - Rebuilt to regenerate depmap files - Resolves: rhbz#988797