[arch-commits] Commit in apache-ant/repos (extra-i686 extra-i686/PKGBUILD)

[Paul Mattal]

    Date: Thursday, July 2, 2009 @ 07:40:47
  Author: paul
Revision: 44514

Merged revisions 44513 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/apache-ant/trunk

........
  r44513 | paul | 2009-07-02 07:40:31 -0400 (Thu, 02 Jul 2009) | 2 lines
  
  upgpkg: apache-ant 1.7.1-3
      fix #15229: added junit.jar symlink, optdepend on junit
........

Modified:
  apache-ant/repos/extra-i686/	(properties)
  apache-ant/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Property changes on: apache-ant/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /apache-ant/trunk:1-42054
   + /apache-ant/trunk:1-44513

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-02 11:40:31 UTC (rev 44513)
+++ extra-i686/PKGBUILD	2009-07-02 11:40:47 UTC (rev 44514)
@@ -4,12 +4,13 @@
 
 pkgname=apache-ant
 pkgver=1.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A java-based build tool."
 arch=('i686' 'x86_64')
 license=('APACHE')
 url="http://ant.apache.org/"
 depends=('java-runtime')
+optdepends=('junit: to jave junit on the classpath in javac tasks')
 source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
         ${pkgname}.sh)
 md5sums=('9330447f3763b87570dd1118c49a8efd'
@@ -33,6 +34,13 @@
   find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
     -exec install -m755 {} ${pkgdir}/${ANT_HOME}/bin \; || return 1
 
+  # symlink to junit so it's on the javac build path for ant
+  # matches behavior on ubuntu 9 and makes sense for compatibility
+  # http://bugs.archlinux.org/task/15229
+  cd $startdir/pkg/usr/share/java/apache-ant/lib || return 1
+  ln -s ../../junit.jar . || return 1
+  cd - || return 1
+
   # The license says the NOTICE file should be redistributed for derivative
   # works, so lets supply it.
   install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} || return 1