SPECS (AC-branch): ant.spec - org/xml/sax/ext/Attributes2 not avai...

[glen]

Author: glen                         Date: Tue Apr 10 19:24:51 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- org/xml/sax/ext/Attributes2 not available prior jdk 1.5

---- Files affected:
SPECS:
   ant.spec (1.70.2.3 -> 1.70.2.4) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.70.2.3 SPECS/ant.spec:1.70.2.4
--- SPECS/ant.spec:1.70.2.3	Tue Apr 10 01:07:46 2007
+++ SPECS/ant.spec	Tue Apr 10 21:24:45 2007
@@ -42,6 +42,7 @@
 %endif
 #
 %define		_rel	5
+%include	/usr/lib/rpm/macros.java
 Summary:	Ant build tool for Java
 Summary(fr):	Outil de compilation pour java
 Summary(it):	Tool per la compilazione di programmi java
@@ -68,7 +69,7 @@
 %{?with_apache_regexp:BuildRequires:	jakarta-regexp}
 %{?with_javamail:BuildRequires:	javamail}
 BuildRequires:	jaxp_parser_impl
-BuildRequires:	jdk
+BuildRequires:	jdk >= 1.5
 BuildRequires:	jpackage-utils
 %{?with_jsch:BuildRequires:	jsch}
 %{?with_junit:BuildRequires:	junit}
@@ -76,6 +77,7 @@
 %{?with_apache_log4j:BuildRequires:	logging-log4j}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	xml-commons
 Requires:	jdk
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant
@@ -509,7 +511,7 @@
 %patch1 -p1
 
 # clean jar files
-find . -name "*.jar" -exec rm -f {} \;
+find -name '*.jar' | xargs rm -f
 
 sed -i -e 's|@BINDIR@|%{_bindir}|g' \
 	src/main/org/apache/tools/ant/taskdefs/Exec.java \
@@ -518,7 +520,7 @@
 %build
 export JAVA_HOME="%{java_home}"
 
-required_jars="jaxp_parser_impl"
+required_jars="jaxp_parser_impl xml-commons-apis"
 %{?with_junit:required_jars="$required_jars junit"}
 %{?with_antlr:required_jars="$required_jars antlr"}
 %{?with_apache_bsf:required_jars="$required_jars bsf jython bsh"}
@@ -534,15 +536,9 @@
 %{?with_jdepend:required_jars="$required_jars jdepend"}
 %{?with_jsch:required_jars="$required_jars jsch"}
 
-export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
 
-export ANT_HOME=./bootstrap
-
-# bootstrap
-sh -x ./bootstrap.sh
-
-# build
-sh -x ./bootstrap/bin/ant -lib lib/optional -emacs --noconfig main javadocs
+sh -e build.sh --noconfig main javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -861,6 +857,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70.2.4  2007/04/10 19:24:45  glen
+- org/xml/sax/ext/Attributes2 not available prior jdk 1.5
+
 Revision 1.70.2.3  2007/04/09 23:07:46  glen
 - optional jar todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.70.2.3&r2=1.70.2.4&f=u