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

[Guillaume Alaux]

    Date: Saturday, May 5, 2012 @ 08:17:54
  Author: guillaume
Revision: 158650

Set dependency on 'java-rhino' rather than 'rhino'

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-05 11:55:48 UTC (rev 158649)
+++ PKGBUILD	2012-05-05 12:17:54 UTC (rev 158650)
@@ -24,14 +24,14 @@
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
 _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
@@ -291,7 +291,7 @@
   
   # Install desktop files.
   install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
+  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications
 }
 
 package_jdk7-openjdk() {
@@ -332,6 +332,10 @@
   done
   popd
 
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/applications
+  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
+
   # Handling 'java-rmi.cgi' separately
   install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi