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

[Jan de Groot]

    Date: Wednesday, July 1, 2009 @ 17:41:03
  Author: jgc
Revision: 44383

Merged revisions 44382 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r44382 | jgc | 2009-07-01 23:40:46 +0200 (Wed, 01 Jul 2009) | 2 lines
  
  upgpkg: openjdk6 1.5-3
      Rebuild against xulrunner 1.9.1, fix ant location
........

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

----------+
 PKGBUILD |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Property changes on: openjdk6/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-40700
   + /openjdk6/trunk:1-44382

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-01 21:40:46 UTC (rev 44382)
+++ extra-x86_64/PKGBUILD	2009-07-01 21:41:03 UTC (rev 44383)
@@ -8,7 +8,7 @@
 pkgver=1.5
 _hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
 _icedteaver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 _hotspotver=25a020f13592 # what it downlopads itself / remove from configure to get it
 depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst')
 makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11'
-	     'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.10' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
+	     'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.10' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
 optdepends=('xulrunner: for the browser plugin'
             'alsa-lib: for sound'
             'giflib: for gif format support')
@@ -97,6 +97,7 @@
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
+  --with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
 
 #	--enable-npplugin \