[arch-commits] Commit in icedtea-web/trunk (PKGBUILD fix-man-location.patch)

[andyrtr at archlinux.org]

    Date: Thursday, June 9, 2011 @ 02:45:41
  Author: andyrtr
Revision: 126971

upgpkg: icedtea-web 1.1-1
upstream update icedtea-web 1.1

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

------------------------+
 PKGBUILD               |   21 +++++++++------------
 fix-man-location.patch |   13 -------------
 2 files changed, 9 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-09 04:40:21 UTC (rev 126970)
+++ PKGBUILD	2011-06-09 06:45:41 UTC (rev 126971)
@@ -3,25 +3,20 @@
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.0.2
+pkgver=1.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'xulrunner')
-install=$pkgname.install
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
-        fix-man-location.patch)
-md5sums=('4b5d80f4b82e53f4947e6782a0472d54'
-         '58e305aa0d27d59f543d9cfddc6e175a')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
+md5sums=('a7d70cb446c38213e554d4bdfb926f63')
 
 build() {
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   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
   make
@@ -31,6 +26,7 @@
 
   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
@@ -48,10 +44,11 @@
   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
+  rm -rf ${pkgdir}/usr/share/doc
 
   # link binaries into /usr/bin + jre/bin
   install -m755 -d ${pkgdir}/usr/bin
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
   pushd ${pkgdir}/${_jvmdir}/bin
   for file in *; do
     ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
@@ -61,7 +58,7 @@
 
   # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
   install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
 }
 
 package_icedtea-web-doc() {
@@ -75,8 +72,8 @@
   install -m755 -d $pkgdir/${_jvmdir}/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
+  rm -rf ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/share/man
 }
 
 # plugin test here http://www.java.com/en/download/help/testvm.xml
\ No newline at end of file

Deleted: fix-man-location.patch
===================================================================
--- fix-man-location.patch	2011-06-09 04:40:21 UTC (rev 126970)
+++ fix-man-location.patch	2011-06-09 06:45:41 UTC (rev 126971)
@@ -1,13 +0,0 @@
---- 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_DIR_PREFIX)/lib
- if ENABLE_DOCS
- 	${mkinstalldirs} $(DESTDIR)$(htmldir)