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

[andyrtr at archlinux.org]

    Date: Thursday, February 3, 2011 @ 13:29:14
  Author: andyrtr
Revision: 108814

prepare 1.0 release; requires new openjdk6 1.10 branch build that will follow later

Added:
  icedtea-web/trunk/icedtea-web.install
Modified:
  icedtea-web/trunk/PKGBUILD
  icedtea-web/trunk/fix-man-location.patch

------------------------+
 PKGBUILD               |   73 ++++++++++++++++++-----------------------------
 fix-man-location.patch |   11 +++----
 icedtea-web.install    |   11 +++++++
 3 files changed, 45 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-03 17:19:10 UTC (rev 108813)
+++ PKGBUILD	2011-02-03 18:29:14 UTC (rev 108814)
@@ -1,68 +1,53 @@
 # $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=0.9.hg20110107
+pkgver=1.0
 pkgrel=1
-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"
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
-groups=()
-depends=('openjdk6') # 'libx11' 'zlib'
-makedepends=('zip' 'xulrunner')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=(#$pkgname-$pkgver.tar.gz
-	# latest snapshot from 1.0 release branch
-	# see http://icedtea.classpath.org/hg/release/icedtea-web-1.0/rev/b3647620fa41 for state
-	http://icedtea.classpath.org/hg/release/icedtea-web-1.0/archive/b3647620fa41.tar.bz2
+makedepends=('openjdk6' 'zip' 'xulrunner')
+install=$pkgname.install
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
         fix-man-location.patch)
-noextract=()
-md5sums=('0468c20ad57d1d1f5e5b490956301d8e'
-         '1608d3141594a272d330db6adb64a572')
+md5sums=('f6124dbaef16650f46df5125d8ed7407'
+         '58e305aa0d27d59f543d9cfddc6e175a')
 
 build() {
-#  cd "$srcdir/$pkgname-$pkgver"
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-
-  cd $srcdir/$pkgbase-*
-
-  patch -Np1 -i $srcdir/fix-man-location.patch
-
-  ./autogen.sh
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i $srcdir/fix-man-location.patch
+  autoreconf -v
   ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
       --datarootdir=/usr/share
-#	--disable-doc \
-#	--disable-plugin #--help
   make
 }
 
 package_icedtea-web() {
-#  cd "$srcdir/$pkgname-$pkgver"
-  cd $srcdir/$pkgbase-*
-  make DESTDIR="$pkgdir" install-exec-local
+
+  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')
+
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
+  # remove splitted doc files
+  rm -vrf ${pkgdir}/usr/share/doc
 }
 
 package_icedtea-web-doc() {
-#  cd "$srcdir/$pkgname-$pkgver"
-  cd $srcdir/$pkgbase-*
+
+  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+  cd "$srcdir/$pkgname-$pkgver"
   install -m755 -d $pkgdir/usr/lib/jvm/java-6-openjdk/jre/lib
   make DESTDIR="$pkgdir" install-data-local
+  # remove javaws about and man page
+  rm -vrf ${pkgdir}/usr/lib
+  rm -vrf ${pkgdir}/usr/share/man
 }
 

Modified: fix-man-location.patch
===================================================================
--- fix-man-location.patch	2011-02-03 17:19:10 UTC (rev 108813)
+++ fix-man-location.patch	2011-02-03 18:29:14 UTC (rev 108814)
@@ -1,14 +1,13 @@
-diff -Nur icedtea-web-1-0-b3647620fa41.orig/Makefile.am icedtea-web-1-0-b3647620fa41/Makefile.am
---- icedtea-web-1-0-b3647620fa41.orig/Makefile.am	2011-01-07 05:08:41.000000000 -0800
-+++ icedtea-web-1-0-b3647620fa41/Makefile.am	2011-01-13 13:25:41.170004189 -0800
-@@ -114,8 +114,8 @@
- 	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
+--- Makefile.am	2011-02-02 03:43:25.000000000 +0100
++++ Makefile.am.new	2011-02-03 14:37:55.556053388 +0100
+@@ -130,8 +130,8 @@
+ endif
  
  install-data-local:
 -	${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
 -	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1
 +	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
 +	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
- 	${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)/jre/lib
+ 	${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
  if ENABLE_DOCS
  	${mkinstalldirs} $(DESTDIR)$(htmldir)

Added: icedtea-web.install
===================================================================
--- icedtea-web.install	                        (rev 0)
+++ icedtea-web.install	2011-02-03 18:29:14 UTC (rev 108814)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}