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

[andyrtr at archlinux.org]

    Date: Friday, February 18, 2011 @ 17:28:16
  Author: andyrtr
Revision: 110347

upgpkg: openjdk6 6.b20_1.9.7-2
fix file conflict #22953

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-18 22:23:25 UTC (rev 110346)
+++ PKGBUILD	2011-02-18 22:28:16 UTC (rev 110347)
@@ -11,7 +11,7 @@
 _openjdk_date=21_jun_2010
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -144,6 +144,9 @@
    # Install man pages.
   install -m755 -d ${pkgdir}/usr/share/man/man1
   install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
+  
+  # https://bugs.archlinux.org/task/22953 - only i686 affected - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=633
+  rm -f  ${pkgdir}/usr/share/man/man1/javaws.1 || /bin/true
 
    # Install demos and samples.
   cp -a demo ${pkgdir}/${_jvmdir}/