[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, March 6, 2012 @ 13:54:38
  Author: andyrtr
Revision: 152417

upgpkg: java7-openjdk 7.b147_2.1-2

fix provides - FS#28797; add install dir path option to make sure all paths are properly set by upstream tools; fix missing libxtst optdep for desktop jre

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-06 18:46:14 UTC (rev 152416)
+++ PKGBUILD	2012-03-06 18:54:38 UTC (rev 152417)
@@ -24,7 +24,7 @@
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -93,6 +93,7 @@
   [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   unset MAKEFLAGS # parallel build is currently broken 
+
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
@@ -122,7 +123,8 @@
         --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
         --enable-pulse-java \
         --enable-nss \
-        --with-rhino
+        --with-rhino \
+        --with-abs-install-dir=${_jvmdir}
 	#--help
 
 #     --enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
@@ -141,7 +143,7 @@
            'ca-certificates-java' 'rhino')
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so')
-  provides=('java-runtime=7')
+  provides=('java-runtime-headless=7')
   conflicts=('java-runtime' 'openjdk6')
   #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
@@ -263,8 +265,10 @@
              'alsa-lib: for basic sound support'
              'giflib: for gif format support'
              'libpulse: for advanced sound support'
-             'gtk2: for the Gtk+ look and feel - desktop usage')
+             'gtk2: for the Gtk+ look and feel - desktop usage'
+             'libxtst: linked in xawt/libmawt.so - desktop usage')
   install=jre7-openjdk.install
+  provides=('java-runtime=7')
   conflicts=('openjdk6')
   
   mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}