diff --git a/ant.spec b/ant.spec index 8e531b9..91a6684 100644 --- a/ant.spec +++ b/ant.spec @@ -2,7 +2,6 @@ %define section free %define bootstrap 1 -%define test 0 Name: ant Version: 1.6.2 @@ -20,7 +19,6 @@ Source2: apache-ant-%{version}.ant.conf 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 @@ Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 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 @@ Javadoc pour %{name}. # 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 @@ for jar in %{name} %{name}-launcher; do %{_libdir}/lib$jar-%{version}.jar.so done -%if %{test} -exit 1 -%endif - # ----------------------------------------------------------------------------- %install @@ -681,7 +667,7 @@ fi # ----------------------------------------------------------------------------- %changelog -* Thu Jul 14 2005 Gary Benson 0:1.6.2-3jpp_11fc +* Fri Jul 15 2005 Gary Benson 0:1.6.2-3jpp_11fc - Bootstrap onto ia64, ppc64, s390 and s390x. * Wed Jun 15 2005 Gary Benson 0:1.6.2-3jpp_10fc