Sat Dec 17 23:14:43 UTC 2011

2 files changed, 9 insertions, 11 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 84488e042..ae3f7e808 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -20,7 +20,7 @@ _LANGTOOLS_CHANGESET=9b85f1265346
 _OPENJDK_CHANGESET=0a76e5390e68
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -92,7 +92,7 @@ build() {
   unset JAVA_HOME
   unset CLASSPATH
   # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-  [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh
+  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   unset MAKEFLAGS
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
@@ -120,11 +120,8 @@ build() {
         --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
         --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
         --enable-pulse-java \
-#        --with-rhino #--help
 
-        #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
-        #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
-        #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
+#        --with-rhino #--help
 
 #     --enable-systemtap      Enable inclusion of SystemTap trace support
 #     --enable-nss            Enable inclusion of NSS security provider
@@ -140,15 +137,16 @@ check() {
 
 package_jre7-openjdk() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
-  depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
+  depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libcups' 'gtk2' 'lcms2'
            'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas')
   optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for sound'
-             'giflib: for gif format support')
+             'giflib: for gif format support'
+             'libpulse: for advanced sound')
   provides=('java-runtime=7')
   conflicts=('java-runtime')
 #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
-  backup=(etc/profile.d/jre7.sh)
+  backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh)
   install=jre7-openjdk.install
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
@@ -208,7 +206,7 @@ package_jdk7-openjdk() {
   provides=('java-environment=7')
   conflicts=('java-environment')
   #  replaces=('openjdk6')
-  backup=(etc/profile.d/jdk7.sh)
+  backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install
index d311e6e44..d19979bf6 100644
--- a/extra/java7-openjdk/jre7-openjdk.install
+++ b/extra/java7-openjdk/jre7-openjdk.install
@@ -5,7 +5,7 @@ post_install() {
   fi
   echo "when you use a non-reparenting window manager"
   echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/jre7.sh"
+  echo "/etc/profile.d/jre.sh"
 #  update-desktop-database -q
 }