jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

oracle-jre: fix deinstallation; conflicts with oracle-jdk.

Browse source
This commit is contained in:
Juan RP 2014-06-22 10:06:01 +02:00
parent 229525645a
commit b4ccebe480
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/oracle-jre/REMOVE
View file

@ -1,6 +1,6 @@
case "$ACTION" in case "$ACTION" in
pre) pre)
. usr/share/java/oracle-jre-vars.sh . usr/share/java/oracle-jre-vars.sh
rm -r usr/lib/java/$PKGNAME rm -r usr/share/java/$PKGNAME
;; ;;
esac esac

3
srcpkgs/oracle-jre/template
View file

@ -2,7 +2,7 @@
pkgname=oracle-jre pkgname=oracle-jre
version=8u5 version=8u5
_longVersion=1.8.0_05 _longVersion=1.8.0_05
revision=1 revision=2
short_desc="Java Runtime Environment (JRE)" short_desc="Java Runtime Environment (JRE)"
maintainer="Enno Boland <eb@s01.de>" maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
@ -14,6 +14,7 @@ depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
hostmakedepends="wget" hostmakedepends="wget"
provides="java-runtime-${version}_1" provides="java-runtime-${version}_1"
replaces="java-runtime>=0" replaces="java-runtime>=0"
conflicts="oracle-jdk>=0"
case "${XBPS_TARGET_MACHINE}" in case "${XBPS_TARGET_MACHINE}" in
x86_64) x86_64)