diff --git a/files/0001-Default-to-using-openjdk-8.patch b/files/0001-Default-to-using-openjdk-11.patch rename from files/0001-Default-to-using-openjdk-8.patch rename to files/0001-Default-to-using-openjdk-11.patch --- a/files/0001-Default-to-using-openjdk-8.patch +++ b/files/0001-Default-to-using-openjdk-11.patch @@ -19,7 +19,7 @@ - if [ -z "$JAVACMD" ]; then - JAVACMD=java - fi -+ JAVA_HOME=/usr/lib64/openjdk-8 ++ JAVA_HOME=/usr/lib64/openjdk-11 + JAVACMD="$JAVA_HOME/bin/java" fi fi diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,21 +1,21 @@ name : apache-ant -version : 1.10.7 -release : 6 +version : 1.10.8 +release : 7 source : - - https://github.com/apache/ant/archive/rel/1.10.7.tar.gz : 76847cb016937266872b5f83bd5a6dc3587b9df6a6545f57213f79358c16457a + - https://github.com/apache/ant/archive/rel/1.10.8.tar.gz : 09a051b07d4d1d20b4403baf3365b446f470a4448f020dc54895fc2e03c4a9cf license : Apache-2.0 component : programming.java summary : A software tool for automating software build processes description: | Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. builddeps : - - openjdk-8 + - openjdk-11 rundeps : - - openjdk-8 + - openjdk-11 setup : | - %patch -p1 < $pkgfiles/0001-Default-to-using-openjdk-8.patch + %patch -p1 < $pkgfiles/0001-Default-to-using-openjdk-11.patch build : | - export JAVA_HOME=/usr/lib64/openjdk-8 + export JAVA_HOME=/usr/lib64/openjdk-11 ./build.sh -Dant.install=$installdir/usr install-lite install : | mv $installdir/usr/lib $installdir/usr/lib64 diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ apache-ant - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com Apache-2.0 programming.java @@ -53,12 +53,12 @@ - - 2019-11-25 - 1.10.7 + + 2020-06-05 + 1.10.8 Packaging update - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com \ No newline at end of file