mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 08:03:51 +02:00
oracle-j{dk,re}: fix removal; remove obsolete replaces; misc improvements.
This commit is contained in:
parent
0e57ccb809
commit
087637a942
6 changed files with 8 additions and 4 deletions
|
@ -4,7 +4,7 @@
|
||||||
# properly.
|
# properly.
|
||||||
#
|
#
|
||||||
|
|
||||||
BUILD_DIR="./var/tmp/${PKGNAME}.build"
|
BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
mkdir -p "$BUILD_DIR"
|
mkdir -p "$BUILD_DIR"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
case "$ACTION" in
|
case "$ACTION" in
|
||||||
pre)
|
pre)
|
||||||
. usr/lib/jvm/oracle-jdk-vars.sh
|
. usr/lib/jvm/oracle-jdk-vars.sh
|
||||||
|
rm -rf usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION
|
||||||
rm -r usr/lib/jvm/$PKGNAME
|
rm -r usr/lib/jvm/$PKGNAME
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
# Template file for 'oracle-jdk'
|
# Template file for 'oracle-jdk'
|
||||||
pkgname=oracle-jdk
|
pkgname=oracle-jdk
|
||||||
version=8u66
|
version=8u66
|
||||||
|
revision=3
|
||||||
|
|
||||||
_longVersion=1.8.0_66
|
_longVersion=1.8.0_66
|
||||||
revision=2
|
|
||||||
_build=17
|
_build=17
|
||||||
|
|
||||||
short_desc="Java Development Kit (JDK)"
|
short_desc="Java Development Kit (JDK)"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# properly.
|
# properly.
|
||||||
#
|
#
|
||||||
|
|
||||||
BUILD_DIR="./var/tmp/${PKGNAME}.build"
|
BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
mkdir -p "$BUILD_DIR"
|
mkdir -p "$BUILD_DIR"
|
||||||
|
|
|
@ -2,5 +2,6 @@ case "$ACTION" in
|
||||||
pre)
|
pre)
|
||||||
. usr/lib/jvm/oracle-jre-vars.sh
|
. usr/lib/jvm/oracle-jre-vars.sh
|
||||||
rm -r usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
|
rm -r usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
|
||||||
|
rm -r usr/lib/jvm/$PKGNAME
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
# Template file for 'oracle-jre'
|
# Template file for 'oracle-jre'
|
||||||
pkgname=oracle-jre
|
pkgname=oracle-jre
|
||||||
version=8u66
|
version=8u66
|
||||||
|
revision=3
|
||||||
|
|
||||||
_longVersion=1.8.0_66
|
_longVersion=1.8.0_66
|
||||||
revision=2
|
|
||||||
_build=17
|
_build=17
|
||||||
|
|
||||||
short_desc="Java Runtime Environment (JRE)"
|
short_desc="Java Runtime Environment (JRE)"
|
||||||
|
|
Loading…
Add table
Reference in a new issue