[tomcat6/f14/master] Returned to using ant-xtrax because f14 is using ant-nodeps 1.7 versus ant-nodeps 1.8.

[Dave Knox]

commit 5e77b006fbfdbfd7984c578eceaf93a163b169a8
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Tue Oct 5 12:54:59 2010 -0600

    Returned to using ant-xtrax because f14 is using ant-nodeps 1.7 versus
    ant-nodeps 1.8.

 tomcat6.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 2b79798..8362df7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -78,7 +78,7 @@ Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: ant
-BuildRequires: ant-nodeps
+BuildRequires: ant-trax
 BuildRequires: ecj
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
@@ -222,7 +222,7 @@ popd
 
 %build
 export CLASSPATH=
-export OPT_JAR_LIST="ant/ant-nodeps"
+export OPT_JAR_LIST="ant/ant-trax"
 pushd %{packdname}
    # we don't care about the tarballs and we're going to replace
    # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
@@ -599,6 +599,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Tue Oct 05 2010 David Knox <dknox at redhat.com> 0:6.0.26-11
+- Returned to using ant-trax because f14 is not using ant-nodeps-1.8
+
 * Mon Oct 04 2010 David Knox <dknox at redhat.com> 0:6.0.26-10
 - ant-nodeps is breaking the build. Put ant-nodeps on the 
 - OPT_JAR_LIST