diff --git a/srcpkgs/oracle-jre/REMOVE b/srcpkgs/oracle-jre/REMOVE index 9dddecefb0..1d2c86d649 100644 --- a/srcpkgs/oracle-jre/REMOVE +++ b/srcpkgs/oracle-jre/REMOVE @@ -1,6 +1,6 @@ case "$ACTION" in pre) . usr/share/java/oracle-jre-vars.sh - rm -r usr/lib/java/$PKGNAME + rm -r usr/share/java/$PKGNAME ;; esac diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template index 2cfa731b58..0ddf51f2b4 100644 --- a/srcpkgs/oracle-jre/template +++ b/srcpkgs/oracle-jre/template @@ -2,7 +2,7 @@ pkgname=oracle-jre version=8u5 _longVersion=1.8.0_05 -revision=1 +revision=2 short_desc="Java Runtime Environment (JRE)" maintainer="Enno Boland " 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" provides="java-runtime-${version}_1" replaces="java-runtime>=0" +conflicts="oracle-jdk>=0" case "${XBPS_TARGET_MACHINE}" in x86_64)