diff options
Diffstat (limited to 'libre/apache-ant')
| -rw-r--r-- | libre/apache-ant/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/apache-ant/apache-ant-build.patch | 11 |
2 files changed, 6 insertions, 20 deletions
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index 8f95874db..a4508a77a 100644 --- a/libre/apache-ant/PKGBUILD +++ b/libre/apache-ant/PKGBUILD @@ -4,9 +4,9 @@ # Contributor (Arch): Paul Mattal <paul@archlinux.org> pkgname=apache-ant -pkgver=1.9.6 +pkgver=1.9.7 pkgdesc='A java-based build tool' -pkgrel=1.parabola2 +pkgrel=1.parabola1 arch=('any') url='http://ant.apache.org/' license=('APACHE' 'custom:BSD3') @@ -18,15 +18,13 @@ source=(https://www.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2 apache-ant.csh apache-ant.install bin_ant - ant.conf - apache-ant-build.patch) -sha256sums=('2ad98dd3a4805452e546e0f5b682360370ae11692a2157fff8ec6d177c957123' + ant.conf) +sha256sums=('9e5c36759b81e0b16f2f1747631e81dc86fe904e45b413a6ca15d10b3282ab0b' '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718' '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995' '3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3' '29b443ae3af7e246b4ff0b5ec9f023ae95992db1a010a362e70ca7a65a6df461' - 'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb' - '3294d6714b276f446517f699d2a26e01ae1738c0adccf9a454ea58454f513687') + 'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb') # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies # The format is: @@ -51,6 +49,7 @@ _library_dependencies=( jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar resolver.jar:"external files for 'xmlcatalog' datatype":java-resolver:/usr/share/java/resolver.jar jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar + hamcrest-core-1.3.jar:'java matcher objects library':java-hamcrest:/usr/share/java/hamcrest-core.jar ) for _dep in "${_library_dependencies[@]}"; do @@ -65,8 +64,6 @@ prepare() { rm -rv lib/optional/*.jar rm -rv src/etc/testcases/taskdefs/conditions/jars/*.jar - patch -Np1 -i ../apache-ant-build.patch - # Symlink to external optional libraries/ local _dep _jarname _desc _pkgname _jarpath for _dep in "${_library_dependencies[@]}"; do diff --git a/libre/apache-ant/apache-ant-build.patch b/libre/apache-ant/apache-ant-build.patch deleted file mode 100644 index dc1d4b455..000000000 --- a/libre/apache-ant/apache-ant-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-ant-1.9.6.orig/build.xml 2015-06-28 23:46:12.000000000 -0500 -+++ apache-ant-1.9.6/build.xml 2015-12-09 22:07:51.217674735 -0500 -@@ -899,7 +899,7 @@ - =================================================================== - --> - <target name="dist-lite" -- depends="jars,test-jar" -+ depends="jars" - description="--> creates a minimum distribution to run Apache Ant"> - - <mkdir dir="${dist.dir}"/> |