From 67cad48f5d0b0b9b27a666d71d4e17c4e48048b7 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 21 Sep 2010 04:32:19 +0000 Subject: java: archsync and removed jre from community --- abs/extra-testing/community/jre/PKGBUILD | 58 ---------- abs/extra-testing/community/jre/jre.install | 26 ----- abs/extra-testing/community/jre/jre.profile | 4 - abs/extra-testing/java-sun/PKGBUILD | 123 +++++++++++++++++++++ .../java-sun/java-control-panel.desktop | 12 ++ .../java-monitoring-and-management-console.desktop | 9 ++ .../java-sun/java-policy-settings.desktop | 10 ++ abs/extra-testing/java-sun/java-visualvm.desktop | 11 ++ abs/extra-testing/java-sun/java-web-start.desktop | 13 +++ abs/extra-testing/java-sun/jdk.install | 11 ++ abs/extra-testing/java-sun/jdk.profile | 4 + abs/extra-testing/java-sun/jre.install | 22 ++++ abs/extra-testing/java-sun/jre.profile | 4 + 13 files changed, 219 insertions(+), 88 deletions(-) delete mode 100644 abs/extra-testing/community/jre/PKGBUILD delete mode 100644 abs/extra-testing/community/jre/jre.install delete mode 100644 abs/extra-testing/community/jre/jre.profile create mode 100644 abs/extra-testing/java-sun/PKGBUILD create mode 100644 abs/extra-testing/java-sun/java-control-panel.desktop create mode 100644 abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop create mode 100644 abs/extra-testing/java-sun/java-policy-settings.desktop create mode 100644 abs/extra-testing/java-sun/java-visualvm.desktop create mode 100644 abs/extra-testing/java-sun/java-web-start.desktop create mode 100644 abs/extra-testing/java-sun/jdk.install create mode 100644 abs/extra-testing/java-sun/jdk.profile create mode 100644 abs/extra-testing/java-sun/jre.install create mode 100644 abs/extra-testing/java-sun/jre.profile diff --git a/abs/extra-testing/community/jre/PKGBUILD b/abs/extra-testing/community/jre/PKGBUILD deleted file mode 100644 index cd9a932..0000000 --- a/abs/extra-testing/community/jre/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD,v 1.6 2009/06/01 19:10:05 wonder Exp $ -# Maintainer: Jason Chu - -pkgname=jre -pkgver=6u14 -pkgrel=1 -pkgdesc="Sun's java runtime environment" -arch=('i686' 'x86_64') - [ "$CARCH" = "i686" ] && _arch=i586 - [ "$CARCH" = "x86_64" ] && _arch=amd64 -url="http://java.sun.com" -depends=('glibc' 'libxtst') -install="jre.install" -source=(http://download.java.net/dlj/binaries/jdk-$pkgver-dlj-linux-$_arch.bin - https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh - jre.profile) -[ "$CARCH" = "i686" ] && md5sums=('299c445e4b14bfbb2a05323734d89c0c' - '94065b612df0046d9ae758943f9f6a75' - '50b4f5ac4129097461d246645d73a622') -[ "$CARCH" = "x86_64" ] && md5sums=('6e866db04748296fc34ed83a92420403' - '94065b612df0046d9ae758943f9f6a75' - '50b4f5ac4129097461d246645d73a622') - - -replaces=('j2re') -conflicts=('j2re' 'java-runtime') -provides=('j2re' 'java-runtime=6') -license=('custom') - -build() { - cd $startdir/src - - mkdir unbundle-jdk - cd unbundle-jdk - - sh ../jdk-$pkgver-dlj-linux-$_arch.bin --accept-license - - cd .. - - sh construct.sh unbundle-jdk linux-jdk linux-jre - - mkdir -p $startdir/pkg/opt/java - mv linux-jdk/jre $startdir/pkg/opt/java - - install -D -m755 $startdir/src/${pkgname}.profile $startdir/pkg/etc/profile.d/${pkgname}.sh - - mkdir -p $startdir/pkg/usr/lib/mozilla/plugins - - if [ "$CARCH" = "i686" ]; then - ln -s /opt/java/jre/lib/i386/libnpjp2.so $startdir/pkg/usr/lib/mozilla/plugins - else ln -s /opt/java/jre/lib/amd64/libnpjp2.so $startdir/pkg/usr/lib/mozilla/plugins - fi - - mkdir -p $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/COPYRIGHT $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/LICENSE $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jre -} diff --git a/abs/extra-testing/community/jre/jre.install b/abs/extra-testing/community/jre/jre.install deleted file mode 100644 index 4e557a7..0000000 --- a/abs/extra-testing/community/jre/jre.install +++ /dev/null @@ -1,26 +0,0 @@ -post_upgrade() { - post_install $1 -} - -post_install() { - echo "The jre package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/jre/LICENSE before using it." - if [ -f /etc/mailcap ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - fi - echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap -} - -post_remove() { - mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) - if [ "$mailcap" != "" ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - else - rm /etc/mailcap - fi -} - -op=$1 -shift -$op $* diff --git a/abs/extra-testing/community/jre/jre.profile b/abs/extra-testing/community/jre/jre.profile deleted file mode 100644 index af3e373..0000000 --- a/abs/extra-testing/community/jre/jre.profile +++ /dev/null @@ -1,4 +0,0 @@ -export PATH=$PATH:/opt/java/jre/bin -if [ ! -f /etc/profile.d/jdk.sh ]; then - export JAVA_HOME=/opt/java/jre -fi diff --git a/abs/extra-testing/java-sun/PKGBUILD b/abs/extra-testing/java-sun/PKGBUILD new file mode 100644 index 0000000..b348f0d --- /dev/null +++ b/abs/extra-testing/java-sun/PKGBUILD @@ -0,0 +1,123 @@ +# $Id: PKGBUILD 22893 2010-07-31 09:47:07Z ibiru $ +# Contributor: Geoffroy Carrier +# Contributor: Jason Chu +# Maintainer: Daniel J Griffiths +# Contributor: Guillaume ALAUX + +pkgname=('jre' 'jdk') +pkgbase=java-sun +pkgver=6u21 +pkgrel=1 +pkgdesc="Sun/Oracle's implementation of tha Java 6 specification" +arch=('i686' 'x86_64') + [ "$CARCH" = "i686" ] && _arch=i586 + [ "$CARCH" = "x86_64" ] && _arch=amd64 +url="http://java.sun.com" +license=('custom') +makedepends=('java-runtime') +source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin + https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh + jdk.profile + java-control-panel.desktop + java-monitoring-and-management-console.desktop + java-policy-settings.desktop + java-visualvm.desktop + java-web-start.desktop + jre.profile) + +[ "$CARCH" = "i686" ] && md5sums=('b3fbbe55bafedb3f8f93e91d4e809390' + '94065b612df0046d9ae758943f9f6a75' + '7aaac9ec3e440b92361c6561ac00424a' + 'e4d814c0f310d77ed6990c731bccd0fb' + '4bc2b0be93f76ed07b471e3c89eb5a8a' + '8e3cec7ab641ec449cabd068be583f5c' + '9ba148ebabce8ed3351b813a9a66b6e5' + '568451cf45fc8c7adb83a222a61ca2c6' + '50b4f5ac4129097461d246645d73a622') +[ "$CARCH" = "x86_64" ] && md5sums=('7961051f95c014a9b94ffe3e95ea66e6' + '94065b612df0046d9ae758943f9f6a75' + '7aaac9ec3e440b92361c6561ac00424a' + 'e4d814c0f310d77ed6990c731bccd0fb' + '4bc2b0be93f76ed07b471e3c89eb5a8a' + '8e3cec7ab641ec449cabd068be583f5c' + '9ba148ebabce8ed3351b813a9a66b6e5' + '568451cf45fc8c7adb83a222a61ca2c6' + '50b4f5ac4129097461d246645d73a622') + +build() { + cd ${srcdir} + mkdir unbundle-jdk + cd unbundle-jdk + sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license + cd .. + sh construct.sh unbundle-jdk linux-jdk linux-jre +} + +package_jre() { + pkgdesc="Sun/Oracle's Java Runtime Environment" + depends=('glibc' 'libxtst') + provides=('j2re' 'java-runtime=6') + conflicts=('j2re' 'java-runtime') + replaces=('j2re') + install='jre.install' + + cd ${srcdir} + + mkdir -p ${pkgdir}/opt/java + cp -R linux-jdk/jre ${pkgdir}/opt/java + + install -Dm755 ${srcdir}/jre.profile ${pkgdir}/etc/profile.d/jre.sh + + mkdir -p ${pkgdir}/usr/lib/mozilla/plugins + + if [ "$CARCH" = "i686" ]; then + ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins + else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins + fi + + mkdir -p ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/COPYRIGHT ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/LICENSE ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jre + + # Fix system prefs folder (FS#18872) + install -dm755 ${pkgdir}/etc/.java/.systemPrefs +} + +package_jdk() { + pkgdesc="Sun/Oracle's Java Development Kit" + depends=('glibc' 'jre') + provides=('java-environment=6' 'j2sdk') + conflicts=('java-environment' 'j2sdk') + replaces=('j2sdk') + install='jdk.install' + + cd ${srcdir} + + #copy icon + install -Dm644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ + ${pkgdir}/usr/share/pixmaps/java.png + + rm -rf linux-jdk/jre + mkdir -p ${pkgdir}/opt + mv linux-jdk ${pkgdir}/opt/java + + install -D -m755 ${srcdir}/jdk.profile ${pkgdir}/etc/profile.d/jdk.sh + + mkdir -p ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/COPYRIGHT ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/LICENSE ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jdk + + #desktop entries + install -Dm644 ${srcdir}/java-control-panel.desktop \ + ${pkgdir}/usr/share/applications/java-control-panel.desktop + install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ + ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop + install -Dm644 ${srcdir}/java-policy-settings.desktop \ + ${pkgdir}/usr/share/applications/java-policy-settings.desktop + install -Dm644 ${srcdir}/java-visualvm.desktop \ + ${pkgdir}/usr/share/applications/java-visualvm.desktop + install -Dm644 ${srcdir}/java-web-start.desktop \ + ${pkgdir}/usr/share/applications/java-web-start.desktop +} diff --git a/abs/extra-testing/java-sun/java-control-panel.desktop b/abs/extra-testing/java-sun/java-control-panel.desktop new file mode 100644 index 0000000..476e04a --- /dev/null +++ b/abs/extra-testing/java-sun/java-control-panel.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Exec=/opt/java/bin/jcontrol +GenericName[cs]=Nastavení prostředí Java +GenericName=Java Environment Settings +Icon=java +Name[cs]=Nastavení Javy +Name=Java Control Panel +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop b/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop new file mode 100644 index 0000000..c0e1e59 --- /dev/null +++ b/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/opt/java/bin/jconsole +Icon=java +Name[cs]=Konzole monitorování a správy prostředí Java +Name=Java Monitoring and Management Console +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/abs/extra-testing/java-sun/java-policy-settings.desktop b/abs/extra-testing/java-sun/java-policy-settings.desktop new file mode 100644 index 0000000..1009301 --- /dev/null +++ b/abs/extra-testing/java-sun/java-policy-settings.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Exec=/opt/java/bin/policytool +Icon=java +Name[cs]=Nastavení politiky Java aplikací +Name=Java Policy Settings +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/abs/extra-testing/java-sun/java-visualvm.desktop b/abs/extra-testing/java-sun/java-visualvm.desktop new file mode 100644 index 0000000..8aa9527 --- /dev/null +++ b/abs/extra-testing/java-sun/java-visualvm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Exec=/opt/java/bin/jvisualvm +GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací +GenericName=Java Monitoring and Performance Monitoring Tool +Icon=java +Name=Java VisualVM +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/abs/extra-testing/java-sun/java-web-start.desktop b/abs/extra-testing/java-sun/java-web-start.desktop new file mode 100644 index 0000000..573ddc0 --- /dev/null +++ b/abs/extra-testing/java-sun/java-web-start.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Exec=/opt/java/bin/javaws -viewer +GenericName[cs]=Spravovat a spouštět aplikace Java Web Start +GenericName=Manage and run Java Web Start Applications +Icon=java +MimeType=application/x-java-jnlp-file; +Name[cs]=Java Web Start +Name=Java Web Start +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Network;Java; diff --git a/abs/extra-testing/java-sun/jdk.install b/abs/extra-testing/java-sun/jdk.install new file mode 100644 index 0000000..ae439b1 --- /dev/null +++ b/abs/extra-testing/java-sun/jdk.install @@ -0,0 +1,11 @@ +post_upgrade() { + post_install $1 +} + +post_install() { + echo "The jdk package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/opt/java/LICENSE before using it." + +} + diff --git a/abs/extra-testing/java-sun/jdk.profile b/abs/extra-testing/java-sun/jdk.profile new file mode 100644 index 0000000..9bee9a7 --- /dev/null +++ b/abs/extra-testing/java-sun/jdk.profile @@ -0,0 +1,4 @@ +export J2SDKDIR=/opt/java +export PATH=$PATH:/opt/java/bin +export JAVA_HOME=/opt/java +export DERBY_HOME=/opt/java/db diff --git a/abs/extra-testing/java-sun/jre.install b/abs/extra-testing/java-sun/jre.install new file mode 100644 index 0000000..41e698f --- /dev/null +++ b/abs/extra-testing/java-sun/jre.install @@ -0,0 +1,22 @@ +post_upgrade() { + post_install $1 +} + +post_install() { + echo "The jre package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/opt/java/jre/LICENSE before using it." + if [ -f /etc/mailcap ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + fi + echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap +} + +post_remove() { + mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) + if [ "$mailcap" != "" ] ; then + sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap + else + rm /etc/mailcap + fi +} diff --git a/abs/extra-testing/java-sun/jre.profile b/abs/extra-testing/java-sun/jre.profile new file mode 100644 index 0000000..af3e373 --- /dev/null +++ b/abs/extra-testing/java-sun/jre.profile @@ -0,0 +1,4 @@ +export PATH=$PATH:/opt/java/jre/bin +if [ ! -f /etc/profile.d/jdk.sh ]; then + export JAVA_HOME=/opt/java/jre +fi -- cgit v0.12