rpms/ant/devel ant.spec, 1.52.2.10, 1.52.2.11 apache-ant-bz163249.patch, 1.1.2.1, NONE

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6282

Modified Files:
      Tag: ant-bootstrap2-branch
	ant.spec 
Removed Files:
      Tag: ant-bootstrap2-branch
	apache-ant-bz163249.patch 
Log Message:
Remove test stuff and prepare to build for real


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.52.2.10
retrieving revision 1.52.2.11
diff -u -r1.52.2.10 -r1.52.2.11
--- ant.spec	14 Jul 2005 15:14:18 -0000	1.52.2.10
+++ ant.spec	15 Jul 2005 09:15:21 -0000	1.52.2.11
@@ -2,7 +2,6 @@
 %define section  free
 
 %define bootstrap	1
-%define test		0
 
 Name:           ant
 Version:        1.6.2
@@ -20,7 +19,6 @@
 Patch0:         apache-ant-%{version}.patch
 Patch1:         apache-ant-%{version}-rpm.patch
 Patch3:         apache-ant-bz157750.patch
-Patch4:         apache-ant-bz163249.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
 Requires:       java-devel
@@ -36,9 +34,6 @@
 BuildRequires:         gcc-java >= 4.0.0-0.43
 BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-%if %{test}
-ExcludeArch: ia64
-%endif
 
 %description
 Ant is a platform-independent build tool for java. It's used by apache
@@ -356,11 +351,6 @@
 # build the javah task (#157750) and make it work with java-gcj-compat
 %patch3 -p1 -b .orig
 
-# work around some stacktrace breakage on ia64 (#163249)
-%ifarch ia64
-%patch4 -p1 -b .orig
-%endif
-
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -391,10 +381,6 @@
         %{_libdir}/lib$jar-%{version}.jar.so
 done
 
-%if %{test}
-exit 1
-%endif
-
 # -----------------------------------------------------------------------------
 
 %install
@@ -681,7 +667,7 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Thu Jul 14 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
+* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
 - Bootstrap onto ia64, ppc64, s390 and s390x.
 
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_10fc


--- apache-ant-bz163249.patch DELETED ---