[arch-commits] CVS update of extra/devel/java-gcj-compat (2 files)

[Jan de Groot]

    Date: Monday, April 30, 2007 @ 09:03:12
  Author: jgc
    Path: /home/cvs-extra/extra/devel/java-gcj-compat

Modified: PKGBUILD (1.5 -> 1.6) java-gcj-compat.profile (1.1 -> 1.2)

upgpkg: java-gcj-compat 1.0.76-1
Update to 1.0.76, introduces java 5.0 support. Add links for libjvm to make OpenOffice detect it. Link the browser plugin to /opt/mozilla to make it useful. AMD64 users will have a browser plugin also now


-------------------------+
 PKGBUILD                |   22 +++++++++++++++-------
 java-gcj-compat.profile |    4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)


Index: extra/devel/java-gcj-compat/PKGBUILD
diff -u extra/devel/java-gcj-compat/PKGBUILD:1.5 extra/devel/java-gcj-compat/PKGBUILD:1.6
--- extra/devel/java-gcj-compat/PKGBUILD:1.5	Mon Apr  2 17:31:53 2007
+++ extra/devel/java-gcj-compat/PKGBUILD	Mon Apr 30 09:03:12 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.5 2007/04/02 21:31:53 jgc Exp $
+# $Id: PKGBUILD,v 1.6 2007/04/30 13:03:12 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=java-gcj-compat
-pkgver=1.0.68
-pkgrel=3
+pkgver=1.0.76
+pkgrel=1
 pkgdesc="Wrapper package to wrap free tools into a java 1.4.2 compatible java environment"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.eclipse.org/"
-depends=('gcc-gcj' 'fastjar' 'eclipse-ecj' 'gjdoc')
+depends=('gcc-gcj>=4.1.2-5' 'fastjar' 'gjdoc>=0.7.8')
 provides=('java-environment' 'java-runtime')
 conflicts=('java-environment' 'java-runtime')
 source=(ftp://sources.redhat.com/pub/rhug/${pkgname}-${pkgver}.tar.gz
 	java-gcj-compat.profile)
-md5sums=('08b2fa8831e1668f18f30bf4f933556f' '95295c63b411668466e683a771a398b0')
+md5sums=('06eb307d4e9d3fb44a4198d4d501142e' 'eee3645b754a5dc77644e8973c077c0e')
 
 build() {
   export MAKEFLAGS="-j1"
@@ -21,8 +21,16 @@
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${startdir}/pkg install
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre/lib
-  ln -s /usr/share/java/libgcj-*.jar ${startdir}/pkg/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre/lib/rt.jar
+  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib
+  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib
+  ln -s /usr/share/java/libgcj-4*.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/rt.jar
+  ln -s /usr/share/java/libgcj-tools-4*.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/tools.jar
+  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/{client,server}
+  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/client/
+  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/server/
   mkdir -p ${startdir}/pkg/etc/profile.d
   install -m755 ${startdir}/src/java-gcj-compat.profile ${startdir}/pkg/etc/profile.d/java-gcj-compat.sh
+
+  mkdir -p ${startdir}/pkg/opt/mozilla/lib/plugins
+  ln -sf /usr/lib/gcj-4.*/libgcjwebplugin.so ${startdir}/pkg/opt/mozilla/lib/plugins/
 }
Index: extra/devel/java-gcj-compat/java-gcj-compat.profile
diff -u extra/devel/java-gcj-compat/java-gcj-compat.profile:1.1 extra/devel/java-gcj-compat/java-gcj-compat.profile:1.2
--- extra/devel/java-gcj-compat/java-gcj-compat.profile:1.1	Mon Jan  1 15:14:17 2007
+++ extra/devel/java-gcj-compat/java-gcj-compat.profile	Mon Apr 30 09:03:12 2007
@@ -1,2 +1,2 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0
-export CLASSPATH=$CLASSPATH:$JAVA_HOME/lib
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0
+export CLASSPATH=${CLASSPATH:+$CLASSPATH:}$JAVA_HOME/lib