Fri Mar 1 00:05:33 PST 2013

4 files changed, 8 insertions, 15 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 348991cd9..b395e03a3 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $
+# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -62,10 +62,10 @@ sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
-            '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
+            'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
-            'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
-            '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
+            'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
+            '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
 noextract=("${_OPENJDK_CHANGESET}.tar.gz"
            "${_CORBA_CHANGESET}.tar.gz"
@@ -248,7 +248,7 @@ package_jre7-openjdk-headless() {
 }
 	 
 package_jre7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs"
   depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
   optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for basic sound support'
diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile
index 91265cc86..89a6a82a0 100644
--- a/extra/java7-openjdk/jdk7-openjdk.profile
+++ b/extra/java7-openjdk/jdk7-openjdk.profile
@@ -1,6 +1 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile
index c86ce857a..b267392e5 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile
+++ b/extra/java7-openjdk/jre7-openjdk.profile
@@ -1,5 +1,4 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
 export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
 
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
 #export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh
index a9aed27d1..c4009af2e 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile.csh
+++ b/extra/java7-openjdk/jre7-openjdk.profile.csh
@@ -1,5 +1,4 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
 setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
 
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
 #setenv _JAVA_AWT_WM_NONREPARENTING 1