summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-31 18:33:29 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-31 18:33:29 +0200
commit6b660a7f29bfc8157d33874c17b202d10173ec27 (patch)
treefc11229174b265a0146bb85d38a7f7f4ef3159b4
parent5e76c95e0fd01b276497d60d5fbd94658f6d7a68 (diff)
Rebuild openjdk6-old without unneeded features.
- don't build openjdk6-old-src - don't provide man pages or /usr/bin symlinks to avoid conflicts with jdk7-openjdk - rebuild using itself
-rw-r--r--pcr/openjdk6/PKGBUILD83
1 files changed, 12 insertions, 71 deletions
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
index 7b6505b86..03cdba0aa 100644
--- a/pcr/openjdk6/PKGBUILD
+++ b/pcr/openjdk6/PKGBUILD
@@ -2,20 +2,26 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=('openjdk6-old' 'openjdk6-old-src')
+pkgname='openjdk6-old'
pkgbase="openjdk6"
_javaver=6
_icedteaver=1.12.3
_openjdk_version=b27
_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=1.1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
- 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt'
- 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'java-environment' 'inetutils' 'wget')
+pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+backup=(etc/profile.d/openjdk6.sh)
+depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
+makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2'
+ 'nspr' 'zlib' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxslt'
+ 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6-old' 'inetutils' 'wget')
+optdepends=('alsa-lib: for sound'
+ 'giflib: for gif format support')
+install=openjdk6.install
options=('!emptydirs')
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
@@ -90,16 +96,7 @@ build() {
LD_PRELOAD="" make
}
-package_openjdk6-old() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('alsa-lib: for sound'
- 'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime' 'jre7-openjdk-headless')
- provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
- install=openjdk6.install
-
+package() {
if [ "${CARCH}" = "x86_64" ]; then
_arch=amd64
else
@@ -125,41 +122,6 @@ package_openjdk6-old() {
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
- # Install man pages.
- install -m755 -d ${pkgdir}/usr/share/man/man1
- install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/
-
- # Install demos and samples.
- cp -a demo ${pkgdir}/${_jvmdir}/
- install -m755 -d sample/rmi
- mv bin/java-rmi.cgi sample/rmi
- cp -a sample ${pkgdir}/${_jvmdir}/
- popd
-
- # Install icons and menu entries.
- for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
- install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
- done
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
- # link binaries into /usr/bin
- install -m755 -d ${pkgdir}/usr/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} \
- ${pkgdir}/usr/bin
- done
- popd
-
- # link JKS keystore from ca-certificates-java
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
- ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
-
# set some variables
install -m755 -d ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh
@@ -168,24 +130,3 @@ package_openjdk6-old() {
# install license
install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
-
-package_openjdk6-old-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6-old')
-
- if [ "${CARCH}" = "x86_64" ]; then
- _arch=amd64
- else
- _arch=i586
- fi
-
- _javaver=6
- _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
- cd ${srcdir}/icedtea6-${_icedteaver}
- install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
- pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
- # Install src.zip file
- cp -a src.zip ${pkgdir}/${_jvmdir}/
-}