Commit 316fbb80 authored by Mateusz's avatar Mateusz

Java update to 6u31, i686 checksum need to be fixed

parent b5ba3937
......@@ -8,79 +8,96 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=jdk
pkgver=6u22
pkgver=6u31
pkgrel=1
pkgdesc="Sun's Java Development Kit"
arch=('i686' 'x86_64')
[ "${CARCH}" = "i686" ] && ARCH=i586
[ "${CARCH}" = "x86_64" ] && ARCH=amd64
[ "${CARCH}" = "x86_64" ] && ARCH=x64
url="http://java.sun.com"
depends=('glibc' 'jre')
install="jdk.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
source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}-b04/jdk-${pkgver}-linux-${ARCH}.bin"
construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true
jdk.profile
java-control-panel.desktop
java-monitoring-and-management-console.desktop
java-policy-settings.desktop
java-visualvm.desktop
java-web-start.desktop)
[ "$CARCH" = "i686" ] && md5sums=('2204fea1b2593f3cc196a0a92b80b18f'
'94065b612df0046d9ae758943f9f6a75'
'7aaac9ec3e440b92361c6561ac00424a'
'e4d814c0f310d77ed6990c731bccd0fb'
'4bc2b0be93f76ed07b471e3c89eb5a8a'
'8e3cec7ab641ec449cabd068be583f5c'
'9ba148ebabce8ed3351b813a9a66b6e5'
'568451cf45fc8c7adb83a222a61ca2c6')
[ "$CARCH" = "x86_64" ] && md5sums=('e5e102ef16d8938f547fe2a73e659608'
'94065b612df0046d9ae758943f9f6a75'
'7aaac9ec3e440b92361c6561ac00424a'
'e4d814c0f310d77ed6990c731bccd0fb'
'4bc2b0be93f76ed07b471e3c89eb5a8a'
'8e3cec7ab641ec449cabd068be583f5c'
'9ba148ebabce8ed3351b813a9a66b6e5'
'568451cf45fc8c7adb83a222a61ca2c6')
jdk.profile.csh
java-control-panel.desktop
java-monitoring-and-management-console.desktop
java-policy-settings.desktop
java-visualvm.desktop
java-web-start.desktop)
[ "${CARCH}" = 'i686' ] && md5sums=('0aaabd639e50aaf9fc22153ff0cf76da'
'94065b612df0046d9ae758943f9f6a75'
'7aaac9ec3e440b92361c6561ac00424a'
'6f4cbf332816d2c4e9578ecd1d0dce7f'
'e4d814c0f310d77ed6990c731bccd0fb'
'4bc2b0be93f76ed07b471e3c89eb5a8a'
'8e3cec7ab641ec449cabd068be583f5c'
'9ba148ebabce8ed3351b813a9a66b6e5'
'568451cf45fc8c7adb83a222a61ca2c6')
[ "${CARCH}" = 'x86_64' ] && md5sums=('2f74dbbee4142b7366c93b115f914fff'
'94065b612df0046d9ae758943f9f6a75'
'7aaac9ec3e440b92361c6561ac00424a'
'6f4cbf332816d2c4e9578ecd1d0dce7f'
'e4d814c0f310d77ed6990c731bccd0fb'
'4bc2b0be93f76ed07b471e3c89eb5a8a'
'8e3cec7ab641ec449cabd068be583f5c'
'9ba148ebabce8ed3351b813a9a66b6e5'
'568451cf45fc8c7adb83a222a61ca2c6')
replaces=('j2sdk')
conflicts=('java-environment' 'j2sdk')
provides=('java-environment=6' 'j2sdk')
license=('custom')
build() {
cd ${srcdir}
cd "${srcdir}"
mkdir unbundle-jdk
cd unbundle-jdk
mkdir unbundle-jdk
cd unbundle-jdk
sh ../jdk-${pkgver}-dlj-linux-${ARCH}.bin --accept-license
sh "../jdk-${pkgver}-linux-${ARCH}.bin" --accept-license
cd ..
cd ..
sh construct.sh unbundle-jdk linux-jdk linux-jre
sh construct.sh unbundle-jdk linux-jdk linux-jre
}
package() {
cd ${srcdir}
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
#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
rm -rf linux-jdk/jre
install -d "${pkgdir}/opt"
mv linux-jdk "${pkgdir}/opt/java"
mkdir -p ${pkgdir}/opt
mv linux-jdk ${pkgdir}/opt/java
install -D "${srcdir}/jdk.profile" \
"${pkgdir}/etc/profile.d/jdk.sh"
install -D "${srcdir}/jdk.profile.csh" \
"${pkgdir}/etc/profile.d/jdk.csh"
install -D -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
install -d "${pkgdir}/usr/share/licenses/jdk"
install -m644 "${pkgdir}/opt/java/COPYRIGHT" \
"${pkgdir}/usr/share/licenses/jdk"
install -m644 "${pkgdir}/opt/java/LICENSE" \
"${pkgdir}/usr/share/licenses/jdk"
install -m644 "${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt" \
"${pkgdir}/usr/share/licenses/jdk"
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
#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"
}
# vim:set ts=2 sw=2 et:
setenv J2SDKDIR /opt/java
setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin
setenv JAVA_HOME /opt/java
setenv DERBY_HOME /opt/java/db
......@@ -8,64 +8,66 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=jre
pkgver=6u26
pkgver=6u31
pkgrel=1
pkgdesc="Sun's java runtime environment"
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=i586
[ "$CARCH" = "x86_64" ] && ARCH=amd64
[ "$CARCH" = "x86_64" ] && ARCH=x64
url="http://java.sun.com"
depends=('glibc' 'libxtst')
install="jre.install"
source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-$ARCH.bin
http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true
source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}-b04/jdk-${pkgver}-linux-${ARCH}.bin"
construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true
jre.profile)
[ "$CARCH" = "i686" ] && md5sums=('2204fea1b2593f3cc196a0a92b80b18f'
'94065b612df0046d9ae758943f9f6a75'
'50b4f5ac4129097461d246645d73a622')
[ "$CARCH" = "x86_64" ] && md5sums=('43f4e9699afce82d3ebae841c59d02fb'
'94065b612df0046d9ae758943f9f6a75'
'50b4f5ac4129097461d246645d73a622')
[ "${CARCH}" = 'i686' ] && md5sums=('e1c967b62c552bc28325619fe2649685'
'94065b612df0046d9ae758943f9f6a75'
'50b4f5ac4129097461d246645d73a622')
[ "${CARCH}" = 'x86_64' ] && md5sums=('2f74dbbee4142b7366c93b115f914fff'
'94065b612df0046d9ae758943f9f6a75'
'50b4f5ac4129097461d246645d73a622')
replaces=('j2re')
conflicts=('j2re' 'java-runtime')
provides=('j2re' 'java-runtime=6')
license=('custom')
build() {
cd ${srcdir}
mv construct.sh?raw=true construct.sh
cd "${srcdir}"
mkdir unbundle-jdk
cd unbundle-jdk
mkdir unbundle-jdk
cd unbundle-jdk
sh ../jdk-${pkgver}-dlj-linux-$ARCH.bin --accept-license
sh "../jdk-${pkgver}-linux-${ARCH}.bin" --accept-license
cd ..
cd ..
sh ./construct.sh unbundle-jdk linux-jdk linux-jre
sh construct.sh unbundle-jdk linux-jdk linux-jre
}
package() {
cd ${srcdir}
cd "${srcdir}"
mkdir -p ${pkgdir}/opt/java
mv linux-jdk/jre ${pkgdir}/opt/java
mkdir -p "${pkgdir}/opt/java"
mv linux-jdk/jre "${pkgdir}/opt/java"
install -Dm755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
install -Dm755 "${srcdir}/${pkgname}.profile" "${pkgdir}/etc/profile.d/${pkgname}.sh"
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
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
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
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
# Fix system prefs folder (FS#18872)
install -dm755 "${pkgdir}/etc/.java/.systemPrefs"
}
# vim:set ts=2 sw=2 et:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment