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

[andyrtr at archlinux.org]

    Date: Thursday, June 9, 2011 @ 12:03:05
  Author: andyrtr
Revision: 127010

upgpkg: icedtea-web 1.1-2
remove a conflicting file in the docs pkg

Modified:
  icedtea-web/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-09 15:59:12 UTC (rev 127009)
+++ PKGBUILD	2011-06-09 16:03:05 UTC (rev 127010)
@@ -4,7 +4,7 @@
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
@@ -22,23 +22,25 @@
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+
 package_icedtea-web() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
   depends=('openjdk6' 'gtk2' 'desktop-file-utils')
   install=$pkgname.install
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+  make DESTDIR="$pkgdir" install-exec-local install-data-local
+
   # Install desktop files.
   install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
   install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
@@ -69,11 +71,12 @@
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd "$srcdir/$pkgbase-$pkgver"
-  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
+#  install -m755 -d $pkgdir/${_jvmdir}/jre/lib
   make DESTDIR="$pkgdir" install-data-local
   # remove javaws about and man page
   rm -rf ${pkgdir}/usr/lib
   rm -rf ${pkgdir}/usr/share/man
+  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
 }
 
 # plugin test here http://www.java.com/en/download/help/testvm.xml
\ No newline at end of file