summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Lundberg2015-09-18 17:24:44 +0200
committerEmil Lundberg2015-09-18 17:24:44 +0200
commitb77afc907c3a735144db31cb3199df6b593fe690 (patch)
treec6c230199bc69f05bbecd395721ef686d547cd81
parentafd2ae88563b40a2bccf713501f2291fcdfd7d7e (diff)
downloadaur-b77afc907c3a735144db31cb3199df6b593fe690.tar.gz
Remove icedtea-web-doc package
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD22
2 files changed, 6 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d45bbd12d5..07fb6cb0afd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = icedtea-web-jre32
makedepends = epiphany
depends = bin32-jre
optdepends = rhino: for using proxy auto config files
+ optdepends = icedtea-web-doc: Documentation
conflicts = icedtea-web
noextract = icedtea-web-1.6.1.tar.gz
source = http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
@@ -31,7 +32,3 @@ pkgname = icedtea-web-jre32
provides = java-web-start
replaces = icedtea-web-java7
-pkgname = icedtea-web-doc
- pkgdesc = icedtea-web browser plugin + Java WebStart - documentation files
- replaces = icedtea-web-java7-doc
-
diff --git a/PKGBUILD b/PKGBUILD
index 08a1362e306..9e2a00a57ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
_pkgbase=icedtea-web
-pkgbase=icedtea-web-jre32
-pkgname=('icedtea-web-jre32' 'icedtea-web-doc')
+pkgname=icedtea-web-jre32
conflicts=('icedtea-web')
pkgver=1.6.1
pkgrel=1
@@ -13,7 +12,9 @@ license=('GPL2')
depends=('bin32-jre')
makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'bin32-jdk'
'firefox' 'epiphany')
-optdepends=('rhino: for using proxy auto config files')
+optdepends=('rhino: for using proxy auto config files'
+ 'icedtea-web-doc: Documentation'
+ )
# Due to broken path names in the tarball that fails with LANG=C in our chroot
noextract=${_pkgbase}-${pkgver}.tar.gz
source=(
@@ -52,7 +53,7 @@ build() {
#}
-package_icedtea-web-jre32() {
+package() {
pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start'
depends=('java-runtime-openjdk' 'desktop-file-utils')
@@ -83,16 +84,3 @@ package_icedtea-web-jre32() {
install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/
ln -sf /usr/share/${_pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/
}
-
-package_icedtea-web-doc() {
-
- pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files'
- replaces=('icedtea-web-java7-doc')
-
- cd "${srcdir}"/${_pkgbase}-${pkgver}
- 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
-}