[arch-commits] Commit in junit/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Wednesday, May 27, 2009 @ 21:07:55
  Author: giovanni
Revision: 40096

Merged revisions 356,40080 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/junit/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r40080 | andrea | 2009-05-27 08:47:07 -0700 (mer, 27 mag 2009) | 1 line
  
  upgpkg: junit 4.6-1
........

Modified:
  junit/repos/extra-x86_64/	(properties)
  junit/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)


Property changes on: junit/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /junit/trunk:1
   + /junit/trunk:1-40095

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-28 00:58:11 UTC (rev 40095)
+++ extra-x86_64/PKGBUILD	2009-05-28 01:07:55 UTC (rev 40096)
@@ -1,32 +1,33 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
 pkgname=junit
-pkgver=4.4
+pkgver=4.6
 pkgrel=1
 pkgdesc="Automated testing framework for Java"
 arch=('i686' 'x86_64')
 url="http://www.junit.org/"
 license=('custom')
 depends=('java-runtime')
-makedepends=('java-gcj-compat' 'fastjar' 'apache-ant')
-source=(http://downloads.sourceforge.net/sourceforge/junit/${pkgname}${pkgver}.zip
+makedepends=('fastjar' 'apache-ant')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}${pkgver}.zip
 	build.xml)
-md5sums=('4755aa0af58a834bedce1f0119dc9514'
+md5sums=('2e59ed558001fd3b10d2146189167ff5'
          'd8bd6d5961386ce602241ed7f87dd5d2')
 
 build() {
-  cd ${startdir}/src/junit${pkgver}
-  jar xf junit-${pkgver}-src.jar || return 1
-  rm -f junit-${pkgver}-src.jar
-  cp ${startdir}/src/build.xml .
+  cd ${srcdir}/${pkgname}${pkgver}
+  jar xf ${pkgname}-${pkgver}-src.jar || return 1
+  rm -f ${pkgname}-${pkgver}-src.jar
+  cp ${srcdir}/build.xml . || return 1
   find . -name \*.class -delete || return 1
   find . -name \*.jar -delete || return 1
 
   ant dist || return 1
-  mkdir -p ${startdir}/pkg/usr/share/java
-  mkdir -p ${startdir}/pkg/usr/lib
-  install -m644 ${pkgname}${pkgver}/junit.jar ${startdir}/pkg/usr/share/java || return 1
+  install -d ${pkgdir}/usr/share/java ${pkgdir}/usr/lib
+  install -m644 ${pkgname}4.4/junit.jar ${pkgdir}/usr/share/java || return 1
   # Do this for ant, though ant needs to have these files in /usr/share/java, but that will get fixed later.
-  ln -sf ../share/java/junit.jar ${startdir}/pkg/usr/lib/junit.jar || return 1
-  install -D cpl-v10.html ${startdir}/pkg/usr/share/licenses/${pkgname}/cpl-v10.html || return 1
+  ln -sf ../share/java/junit.jar ${pkgdir}/usr/lib/junit.jar || return 1
+  install -D cpl-v10.html ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 }