fix build

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd3dcde3744e..9456ccb5fab2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,15 +23,16 @@ pkgbase = jdk-devel
 	provides = java-runtime-headless-jre=11
 	provides = java-web-start-jre=11
 	provides = java-environment-jdk=11
-	provides = 
+	provides = jdk11
+	conflicts = jdk11
 	options = !strip
-	backup = etc/java-/management/jmxremote.access
-	backup = etc/java-/management/management.properties
-	backup = etc/java-/security/java.policy
-	backup = etc/java-/security/java.security
-	backup = etc/java-/logging.properties
-	backup = etc/java-/net.properties
-	backup = etc/java-/sound.properties
+	backup = etc/java-jdk11/management/jmxremote.access
+	backup = etc/java-jdk11/management/management.properties
+	backup = etc/java-jdk11/security/java.policy
+	backup = etc/java-jdk11/security/java.security
+	backup = etc/java-jdk11/logging.properties
+	backup = etc/java-jdk11/net.properties
+	backup = etc/java-jdk11/sound.properties
 	source = http://download.oracle.com/otn-pub/java/jdk/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_linux-x64_bin.tar.gz
 	source = java.desktop
 	source = jconsole.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 12f2a2ef21a2..c84ebcdbf053 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ pkgver=11.0.1
 _major=${pkgver/.*}
 _build=13
 _hash=90cf5d8f270a4347a95050320eef3fb7
+_jname=${_pkgname}${_major}
 pkgrel=1
 pkgdesc="Oracle Java $_major Development Kit Snapshot"
 arch=('x86_64')