Remove gcj workaround (not correct, so assume not necessary)
This commit is contained in:
parent
8813aa5285
commit
d05c7d40d8
8
ant.spec
8
ant.spec
@ -18,7 +18,6 @@ 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
|
|
||||||
Patch3: apache-ant-bz157750.patch
|
Patch3: apache-ant-bz157750.patch
|
||||||
Requires: jaxp_parser_impl
|
Requires: jaxp_parser_impl
|
||||||
Requires: jpackage-utils >= 0:1.5
|
Requires: jpackage-utils >= 0:1.5
|
||||||
@ -344,12 +343,6 @@ 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-gcj-compat
|
|
||||||
if java -version 2>&1 | grep -q "gcj"; then
|
|
||||||
%patch2 -p1
|
|
||||||
rm -f src/script/ant.orig
|
|
||||||
fi
|
|
||||||
|
|
||||||
# build the javah task (#157750) and make it work with java-gcj-compat
|
# build the javah task (#157750) and make it work with java-gcj-compat
|
||||||
%patch3 -p1 -b .orig
|
%patch3 -p1 -b .orig
|
||||||
|
|
||||||
@ -652,6 +645,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com>
|
* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com>
|
||||||
- Add the bsf subpackage since we now ship bsf.
|
- Add the bsf subpackage since we now ship bsf.
|
||||||
|
- Remove gcj workaround (not correct, so assume not necessary).
|
||||||
|
|
||||||
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
|
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
|
||||||
- Make the javah task fall back to executing javah if
|
- Make the javah task fall back to executing javah if
|
||||||
|
Loading…
Reference in New Issue
Block a user