apache-ant: depend on oracle-jdk instead of jdk; revbump
This commit is contained in:
parent
bc0126f90b
commit
9ef4ef4791
|
@ -1,15 +1,15 @@
|
||||||
# Template file for 'apache-ant'
|
# Template file for 'apache-ant'
|
||||||
pkgname="apache-ant"
|
pkgname="apache-ant"
|
||||||
version="1.9.4"
|
version="1.9.4"
|
||||||
revision=1
|
revision=2
|
||||||
short_desc="Java library and command-line tool that help building software"
|
short_desc="Java library and command-line tool that help building software"
|
||||||
maintainer="Enno Boland <eb@s01.de>"
|
maintainer="Enno Boland <eb@s01.de>"
|
||||||
license="Apache License"
|
license="Apache License"
|
||||||
homepage="http://ant.apache.org"
|
homepage="http://ant.apache.org"
|
||||||
distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.bz2"
|
distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.bz2"
|
||||||
checksum="ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c"
|
checksum="ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c"
|
||||||
hostmakedepends="jdk"
|
hostmakedepends="oracle-jdk"
|
||||||
depends="jre"
|
depends="oracle-jdk?java-runtime"
|
||||||
noarch="yes"
|
noarch="yes"
|
||||||
_prefix=usr/share/apache-ant
|
_prefix=usr/share/apache-ant
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@ do_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
JAVA_HOME=/usr/share/java ./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
|
JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
JAVA_HOME=/usr/share/java ./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
|
JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
|
||||||
|
|
||||||
vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
|
vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
|
||||||
rm $DESTDIR/$_prefix/bin/*.bat
|
rm $DESTDIR/$_prefix/bin/*.bat
|
||||||
|
|
Loading…
Reference in New Issue