Page MenuHomeSolus
Files F11033439

D7708.diff
No OneTemporary
Actions

D7708.diff
View Options

diff --git a/files/0001-Default-to-using-openjdk-8.patch b/files/0001-Default-to-using-openjdk-8.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Default-to-using-openjdk-8.patch
@@ -0,0 +1,29 @@
+From 6767064a386563c4af07febd6363ff150f356945 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Mon, 25 Nov 2019 01:05:16 +0100
+Subject: [PATCH] Default to using openjdk-8
+
+---
+ src/script/ant | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/script/ant b/src/script/ant
+index 81107b5..2379c51 100644
+--- a/src/script/ant
++++ b/src/script/ant
+@@ -185,10 +185,8 @@ if [ -z "$JAVACMD" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+- JAVACMD=`which java 2> /dev/null `
+- if [ -z "$JAVACMD" ]; then
+- JAVACMD=java
+- fi
++ JAVA_HOME=/usr/lib64/openjdk-8
++ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ fi
+
+--
+2.24.0
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,25 +1,22 @@
name : apache-ant
-version : 1.9.7
-release : 5
+version : 1.10.7
+release : 6
source :
- - http://supergsego.com/apache//ant/source/apache-ant-1.9.7-src.tar.gz : 648b3f3787bb0cb6226978b6d4898eb7e21ae391385357a5f824972dd910a1c8
+ - https://github.com/apache/ant/archive/rel/1.10.7.tar.gz : 76847cb016937266872b5f83bd5a6dc3587b9df6a6545f57213f79358c16457a
license : Apache-2.0
component : programming.java
-summary : Apache Ant is a Java library and command-line tool that help building software
+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.
+ 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
rundeps :
- openjdk-8
+setup : |
+ %patch -p1 < $pkgfiles/0001-Default-to-using-openjdk-8.patch
build : |
- export JAVA_HOME=/usr/lib64/openjdk-8/
- mkdir build_ant
- ./build.sh -Ddist.dir=build_ant dist
+ export JAVA_HOME=/usr/lib64/openjdk-8
+ ./build.sh -Dant.install=$installdir/usr install-lite
install : |
- mkdir -p $installdir/usr/bin $installdir/usr/lib64
- install -m 755 %workdir%/build_ant/bin/* $installdir/usr/bin
- install -m 755 %workdir%/build_ant/lib/* $installdir/usr/lib64
- rm -rf $installdir/usr/lib64/README build_ant
+ mv $installdir/usr/lib $installdir/usr/lib64
+ find $installdir/usr/bin \( -name '*.cmd' -o -name '*.bat' \) -delete
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,83 +2,63 @@
<Source>
<Name>apache-ant</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>Apache-2.0</License>
- <PartOf>programming</PartOf>
- <Summary xml:lang="en">Apache Ant is a Java library and command-line tool that help building software</Summary>
- <Description xml:lang="en">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.
+ <PartOf>programming.java</PartOf>
+ <Summary xml:lang="en">A software tool for automating software build processes</Summary>
+ <Description xml:lang="en">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.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>apache-ant</Name>
- <Summary xml:lang="en">Apache Ant is a Java library and command-line tool that help building software</Summary>
- <Description xml:lang="en">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.
+ <Summary xml:lang="en">A software tool for automating software build processes</Summary>
+ <Description xml:lang="en">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.
</Description>
- <PartOf>programming</PartOf>
+ <PartOf>programming.java</PartOf>
<Files>
- <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="executable">/usr/bin/ant</Path>
+ <Path fileType="executable">/usr/bin/antRun</Path>
+ <Path fileType="executable">/usr/bin/antRun.pl</Path>
+ <Path fileType="executable">/usr/bin/complete-ant-cmd.pl</Path>
+ <Path fileType="executable">/usr/bin/runant.pl</Path>
+ <Path fileType="executable">/usr/bin/runant.py</Path>
<Path fileType="library">/usr/lib64/ant-antlr.jar</Path>
- <Path fileType="library">/usr/lib64/ant-antlr.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-bcel.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-bcel.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-bsf.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-bsf.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-log4j.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-log4j.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-oro.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-oro.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-regexp.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-regexp.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-resolver.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-resolver.pom</Path>
<Path fileType="library">/usr/lib64/ant-apache-xalan2.jar</Path>
- <Path fileType="library">/usr/lib64/ant-apache-xalan2.pom</Path>
<Path fileType="library">/usr/lib64/ant-commons-logging.jar</Path>
- <Path fileType="library">/usr/lib64/ant-commons-logging.pom</Path>
<Path fileType="library">/usr/lib64/ant-commons-net.jar</Path>
- <Path fileType="library">/usr/lib64/ant-commons-net.pom</Path>
+ <Path fileType="library">/usr/lib64/ant-imageio.jar</Path>
<Path fileType="library">/usr/lib64/ant-jai.jar</Path>
- <Path fileType="library">/usr/lib64/ant-jai.pom</Path>
<Path fileType="library">/usr/lib64/ant-javamail.jar</Path>
- <Path fileType="library">/usr/lib64/ant-javamail.pom</Path>
<Path fileType="library">/usr/lib64/ant-jdepend.jar</Path>
- <Path fileType="library">/usr/lib64/ant-jdepend.pom</Path>
<Path fileType="library">/usr/lib64/ant-jmf.jar</Path>
- <Path fileType="library">/usr/lib64/ant-jmf.pom</Path>
<Path fileType="library">/usr/lib64/ant-jsch.jar</Path>
- <Path fileType="library">/usr/lib64/ant-jsch.pom</Path>
<Path fileType="library">/usr/lib64/ant-junit.jar</Path>
- <Path fileType="library">/usr/lib64/ant-junit.pom</Path>
<Path fileType="library">/usr/lib64/ant-junit4.jar</Path>
- <Path fileType="library">/usr/lib64/ant-junit4.pom</Path>
+ <Path fileType="library">/usr/lib64/ant-junitlauncher.jar</Path>
<Path fileType="library">/usr/lib64/ant-launcher.jar</Path>
- <Path fileType="library">/usr/lib64/ant-launcher.pom</Path>
<Path fileType="library">/usr/lib64/ant-netrexx.jar</Path>
- <Path fileType="library">/usr/lib64/ant-netrexx.pom</Path>
- <Path fileType="library">/usr/lib64/ant-parent.pom</Path>
<Path fileType="library">/usr/lib64/ant-swing.jar</Path>
- <Path fileType="library">/usr/lib64/ant-swing.pom</Path>
<Path fileType="library">/usr/lib64/ant-testutil.jar</Path>
- <Path fileType="library">/usr/lib64/ant-testutil.pom</Path>
+ <Path fileType="library">/usr/lib64/ant-xz.jar</Path>
<Path fileType="library">/usr/lib64/ant.jar</Path>
- <Path fileType="library">/usr/lib64/ant.pom</Path>
- <Path fileType="library">/usr/lib64/libraries.properties</Path>
</Files>
</Package>
<History>
- <Update release="4">
- <Date>2016-08-23</Date>
- <Version>1.9.7</Version>
+ <Update release="6">
+ <Date>2019-11-25</Date>
+ <Version>1.10.7</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 3:41 PM (1 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5804601
Default Alt Text
D7708.diff (9 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.