rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Back out ant-apache-javac-ecj.patch and ant.orig changes as they stop

Browse Source 
eclipse from building.
This commit is contained in:
Andrew Overholt 2005-04-08 19:59:36 +00:00
parent d88688d730
commit e36e35f2f0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ant.spec
View File

@ -3,7 +3,7 @@
Name: ant Name: ant
Version: 1.6.2 Version: 1.6.2
Release: 3jpp_3fc Release: 3jpp_4fc
Epoch: 0 Epoch: 0
Summary: Ant build tool for java Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java Summary(it): Tool per la compilazione di programmi java
@ -20,6 +20,7 @@ Source2: apache-ant-%{version}.ant.conf
# Fix temp directory used for file containing large command strings (> 4k) # Fix temp directory used for file containing large command strings (> 4k)
Patch0: apache-ant-%{version}.patch Patch0: apache-ant-%{version}.patch
Patch1: apache-ant-%{version}-rpm.patch Patch1: apache-ant-%{version}-rpm.patch
Patch2: apache-ant-javac-ecj.patch
Requires: jaxp_parser_impl Requires: jaxp_parser_impl
Requires: jpackage-utils >= 0:1.5 Requires: jpackage-utils >= 0:1.5
# XXX make beehive play nice # XXX make beehive play nice
@ -325,6 +326,12 @@ Javadoc pour %{name}.
# Build OPT_JAR_LIST from the contents of /etc/ant.d/ # Build OPT_JAR_LIST from the contents of /etc/ant.d/
%patch1 -p1 %patch1 -p1
# fix classpath for java-x.y.z-gcj-compat
if java -version 2>&1 | grep -q "gcj"; then
%patch2 -p1
rm -f src/script/ant.orig
fi
# clean jar files # clean jar files
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
@ -582,6 +589,10 @@ fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Fri Apr 08 2005 Andrew Overholt <overholt@redhat.com> 1.6.2-3jpp_4fc
- Back out ant-apache-javac-ecj.patch and ant.orig changes as they stop eclipse
from building.
* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc * Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
- Add NOTICE file as per Apache License version 2.0. - Add NOTICE file as per Apache License version 2.0.
- Remove some now unnecessary gcj workarounds. - Remove some now unnecessary gcj workarounds.