rpms/ant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove dependencies on xerces-j2 and xml-commons-apis

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-07-02 07:45:39 +02:00
parent 86f0e31076
commit c7830d9ec1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ant.spec
View File

@ -66,14 +66,10 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: junit BuildRequires: junit
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xerces-j2
%endif %endif
Requires: jpackage-utils >= 0:1.7.5 Requires: jpackage-utils >= 0:1.7.5
Requires: java-devel >= 0:1.5.0 Requires: java-devel >= 0:1.5.0
%if %without bootstrap
Requires: xerces-j2
%endif
BuildArch: noarch BuildArch: noarch
@ -363,6 +359,8 @@ Javadoc pour %{name}.
#Fixup version #Fixup version
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// 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 # When bootstrapping, we don't have junit
%patch3 %patch3
@ -379,7 +377,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
#install jars #install jars
%if %without bootstrap %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 %endif
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
@ -392,7 +390,7 @@ mv LICENSE.utf8 LICENSE
%if %without bootstrap %if %without bootstrap
%{ant} jars test-jar %{ant} jars test-jar
%if %{build_javadoc} %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 %{ant} javadocs
%endif %endif
%else %else
@ -689,6 +687,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Remove Group tags - Remove Group tags
- Update to current packaging guidelines - Update to current packaging guidelines
- Run tests in %%check instead of %%build - 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 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
- Enable unit tests - Enable unit tests