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

[andyrtr at archlinux.org]

    Date: Wednesday, October 13, 2010 @ 13:51:03
  Author: andyrtr
Revision: 95023

upgpkg: openjdk6 6.b20_1.9.1-1
new version 1.9.1.

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-13 17:23:13 UTC (rev 95022)
+++ PKGBUILD	2010-10-13 17:51:03 UTC (rev 95023)
@@ -6,7 +6,7 @@
 pkgbase="openjdk6"
 #_date=20100715
 _javaver=6
-_icedteaver=1.9
+_icedteaver=1.9.1
 _openjdk_version=b20
 _openjdk_date=21_jun_2010
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -14,7 +14,7 @@
 pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
-license=('GPL2') # + Classpath exception - see http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions#What_license_is_IcedTea_released_under.3F
+license=('custom')
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
 	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.2' 
 	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
@@ -31,8 +31,8 @@
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
 	openjdk6.profile)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('24191e3974ea58cb2bc410590221486c'
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
+md5sums=('8cb71d69a74152b369d3929c5b5badfd'
          '0b36adbf67e4f261e1b827ed4be4f447'
          '22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
          '91adfd41e6f001add4f92ae31216b1e3'
@@ -68,7 +68,6 @@
   cd ${srcdir}/icedtea6-${_icedteaver}
 
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-  ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
 
@@ -180,6 +179,9 @@
   # set some variables
   install -m755 -d ${pkgdir}/etc/profile.d
   install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
+  
+  # install license
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_openjdk6-src() {