From 9ef4ef479109d06079239539b749fe428e2a1796 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 22 Jun 2014 08:07:59 +0200 Subject: [PATCH] apache-ant: depend on oracle-jdk instead of jdk; revbump --- srcpkgs/apache-ant/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template index 8436901375..e6f80ff792 100644 --- a/srcpkgs/apache-ant/template +++ b/srcpkgs/apache-ant/template @@ -1,15 +1,15 @@ # Template file for 'apache-ant' pkgname="apache-ant" version="1.9.4" -revision=1 +revision=2 short_desc="Java library and command-line tool that help building software" maintainer="Enno Boland " license="Apache License" homepage="http://ant.apache.org" distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.bz2" checksum="ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c" -hostmakedepends="jdk" -depends="jre" +hostmakedepends="oracle-jdk" +depends="oracle-jdk?java-runtime" noarch="yes" _prefix=usr/share/apache-ant @@ -20,11 +20,11 @@ do_configure() { } 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() { - 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 rm $DESTDIR/$_prefix/bin/*.bat