From d877627969a69bf4d005e028f1ec11da5736adfb Mon Sep 17 00:00:00 2001
From: faaris <faaris@Kappa>
Date: Fri, 28 Apr 2023 22:56:38 +0100
Subject: [PATCH] fix conflicts with other jdk temurin versions

---
 .SRCINFO | 31 +++++++++++++++----------------
 PKGBUILD | 38 +++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 728e813..be59987 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,23 +29,22 @@ pkgbase = jdk18-temurin
 	provides = jdk-openjdk=18.0.2.1.u1
 	provides = openjdk18-src=18.0.2.1.u1
 	provides = openjdk-src=18.0.2.1.u1
-	replaces = jdk-adoptopenjdk
 	options = !strip
-	backup = etc/java-temurin/logging.properties
-	backup = etc/java-temurin/management/jmxremote.access
-	backup = etc/java-temurin/management/jmxremote.password.template
-	backup = etc/java-temurin/management/management.properties
-	backup = etc/java-temurin/net.properties
-	backup = etc/java-temurin/sdp/sdp.conf.template
-	backup = etc/java-temurin/security/java.policy
-	backup = etc/java-temurin/security/java.security
-	backup = etc/java-temurin/security/policy/limited/default_local.policy
-	backup = etc/java-temurin/security/policy/limited/default_US_export.policy
-	backup = etc/java-temurin/security/policy/limited/exempt_local.policy
-	backup = etc/java-temurin/security/policy/README.txt
-	backup = etc/java-temurin/security/policy/unlimited/default_local.policy
-	backup = etc/java-temurin/security/policy/unlimited/default_US_export.policy
-	backup = etc/java-temurin/sound.properties
+	backup = etc/java-18-temurin/logging.properties
+	backup = etc/java-18-temurin/management/jmxremote.access
+	backup = etc/java-18-temurin/management/jmxremote.password.template
+	backup = etc/java-18-temurin/management/management.properties
+	backup = etc/java-18-temurin/net.properties
+	backup = etc/java-18-temurin/sdp/sdp.conf.template
+	backup = etc/java-18-temurin/security/java.policy
+	backup = etc/java-18-temurin/security/java.security
+	backup = etc/java-18-temurin/security/policy/limited/default_local.policy
+	backup = etc/java-18-temurin/security/policy/limited/default_US_export.policy
+	backup = etc/java-18-temurin/security/policy/limited/exempt_local.policy
+	backup = etc/java-18-temurin/security/policy/README.txt
+	backup = etc/java-18-temurin/security/policy/unlimited/default_local.policy
+	backup = etc/java-18-temurin/security/policy/unlimited/default_US_export.policy
+	backup = etc/java-18-temurin/sound.properties
 	source = https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 1475ca3..679417b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 _majorver=18
 _completever=18.0.2.1
 _updatever=1
-pkgrel=1
+pkgrel=2
 pkgver=${_completever}.u${_updatever}
 _tag_ver=${_completever}+${_updatever}
 _versuffix=U
@@ -38,22 +38,21 @@ provides=("java-runtime-headless=${_majorver}"
           "jdk-openjdk=${pkgver}"
           "openjdk${_majorver}-src=${pkgver}"
           "openjdk-src=${pkgver}")
-replaces=("jdk-adoptopenjdk")
-backup=(etc/java-temurin/logging.properties
-        etc/java-temurin/management/jmxremote.access
-        etc/java-temurin/management/jmxremote.password.template
-        etc/java-temurin/management/management.properties
-        etc/java-temurin/net.properties
-        etc/java-temurin/sdp/sdp.conf.template
-        etc/java-temurin/security/java.policy
-        etc/java-temurin/security/java.security
-        etc/java-temurin/security/policy/limited/default_local.policy
-        etc/java-temurin/security/policy/limited/default_US_export.policy
-        etc/java-temurin/security/policy/limited/exempt_local.policy
-        etc/java-temurin/security/policy/README.txt
-        etc/java-temurin/security/policy/unlimited/default_local.policy
-        etc/java-temurin/security/policy/unlimited/default_US_export.policy
-        etc/java-temurin/sound.properties)
+backup=(etc/java-${_majorver}-temurin/logging.properties
+        etc/java-${_majorver}-temurin/management/jmxremote.access
+        etc/java-${_majorver}-temurin/management/jmxremote.password.template
+        etc/java-${_majorver}-temurin/management/management.properties
+        etc/java-${_majorver}-temurin/net.properties
+        etc/java-${_majorver}-temurin/sdp/sdp.conf.template
+        etc/java-${_majorver}-temurin/security/java.policy
+        etc/java-${_majorver}-temurin/security/java.security
+        etc/java-${_majorver}-temurin/security/policy/limited/default_local.policy
+        etc/java-${_majorver}-temurin/security/policy/limited/default_US_export.policy
+        etc/java-${_majorver}-temurin/security/policy/limited/exempt_local.policy
+        etc/java-${_majorver}-temurin/security/policy/README.txt
+        etc/java-${_majorver}-temurin/security/policy/unlimited/default_local.policy
+        etc/java-${_majorver}-temurin/security/policy/unlimited/default_US_export.policy
+        etc/java-${_majorver}-temurin/sound.properties)
 install=install_jdk18-temurin.sh
 options=(!strip)
 
@@ -78,8 +77,8 @@ package() {
 
   # Conf
   install -dm 755 "${pkgdir}/etc"
-  mv conf "${pkgdir}/etc/java-temurin"
-  ln -sf /etc/java-temurin conf
+  mv conf "${pkgdir}/etc/java-${_majorver}-temurin"
+  ln -sf /etc/java-${_majorver}-temurin conf
 
   # Legal
   install -dm 755 "${pkgdir}/usr/share/licenses"
@@ -103,4 +102,5 @@ package() {
       "${srcdir}/freedesktop-${f}.desktop" \
       "${pkgdir}/usr/share/applications/${f}-${pkgname}.desktop"
   done
+
 }