From 91949faf84dcd0f7feaf7961836b5a9a6e2e5adf Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 15:59:42 +0000
Subject: [PATCH] auto-import changelog data from ant-1.5.2-27.src.rpm Tue May
 25 2004 Gary Benson <gbenson@redhat.com> 1.5.2-27 - Use in-process ecj as the
 default compiler. - Fix broken links in classic-ant's libraries directory
 (#122416).

---
 .cvsignore |  2 +-
 ant.spec   | 23 +++++++++++++++++------
 sources    |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index adfcbc2..8455b0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 apache-ant-1.5.2-src.tar.bz2
-rhug-jakarta-ant-20031215.tar.bz2
+rhug-jakarta-ant-20040524.tar.bz2
diff --git a/ant.spec b/ant.spec
index 9ac849b..e7a1f63 100644
--- a/ant.spec
+++ b/ant.spec
@@ -1,11 +1,11 @@
-%define rhugversion 20031215
+%define rhugversion 20040524
 %define rhugsource1 apache-%{name}-%{version} upstream
-%define rhugpatches 6
+%define rhugpatches 6 9 10
 
 Summary: Build tool for Java applications
 Name: ant
 Version: 1.5.2
-Release: 26
+Release: 27
 URL: http://ant.apache.org/
 Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2
 Source1: apache-%{name}-%{version}-src.tar.bz2
@@ -15,6 +15,8 @@ Patch1: %{name}-rhjpp.patch
 Patch6: %{name}-interpreter.patch
 Patch7: %{name}-bz104986.patch
 Patch8: %{name}-gcj34.patch
+Patch9: %{name}-ecj.patch
+Patch10: %{name}-nag29020.patch
 License: Apache Software License
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,7 +30,8 @@ BuildPrereq: bcel >= 5.0-13
 BuildPrereq: jaf >= 20030319-4
 BuildPrereq: javamail >= 20031006-4
 BuildPrereq: junit >= 3.8.1-4
-Requires: gcc34-java >= 3.4.0-1
+BuildPrereq: ecj
+Requires: libgcj34 >= 3.4.0-1
 Requires: xerces-j >= 2.2.1-16
 Requires: commons-logging >= 1.0.2-15
 Requires: jakarta-regexp >= 1.2-15
@@ -37,6 +40,7 @@ Requires: bcel >= 5.0-13
 Requires: jaf >= 20030319-4
 Requires: javamail >= 20031006-4
 Requires: junit >= 3.8.1-4
+Requires: ecj
 Requires: ant-core = %{version}-%{release}
 
 %description
@@ -55,6 +59,7 @@ Requires: xalan-j >= 2.4.1-14
 Requires: bcel >= 5.0-13
 Requires: jaf >= 20030319-4
 Requires: javamail >= 20031006-4
+Requires: ecj
 
 %description core
 The core classes required by Ant.
@@ -88,6 +93,8 @@ mv %{rhugsource1}
 %patch6 -p0 -b .interpreter
 %patch7 -p0 -b .bz104986
 %patch8 -p0 -b .gcj34
+%patch9 -p0 -b .ecj
+%patch10 -p0 -b .nag29020
 mv ChangeLog ChangeLog.rhug
 mv TODO TODO.rhug
 for f in version.txt defaultManifest.mf; do
@@ -122,8 +129,8 @@ for i in ant ant-optional; do
     ln -s ../../java/$i-%{version}.jar \
         ${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar
 done
-for i in activation bcel commons-logging jakarta-regexp \
-         java_cup junit mail xalan xerces; do
+for i in activation bcel commons-logging ecj jakarta-regexp \
+         junit mail xalan xercesImpl xmlParserAPIs; do
     ln -s ../../java/`ls -l %{_datadir}/java/$i.jar | sed -e 's:.* -> ::'` \
 	${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar
 done
@@ -191,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/org/apache/tools/*
 
 %changelog
+* Tue May 25 2004 Gary Benson <gbenson@redhat.com> 1.5.2-27
+- Use in-process ecj as the default compiler.
+- Fix broken links in classic-ant's libraries directory (#122416).
+
 * Tue May  4 2004 Gary Benson <gbenson@redhat.com> 1.5.2-26
 - Rebuild with new compiler.
 
diff --git a/sources b/sources
index 30bf1c2..e44d69d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1989ee829001dba4e21a4efeff430167  apache-ant-1.5.2-src.tar.bz2
-15b49c344b71d7c6fb049359ccbc54a4  rhug-jakarta-ant-20031215.tar.bz2
+0b7ff32e93367042b8bd5201241481bb  rhug-jakarta-ant-20040524.tar.bz2