Add conflicts to jre, fix backups and common depends. but only on packages

Author: noahvogt

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = java-openjdk-xdg
 	pkgver = 21.u35
-	pkgrel = 2
+	pkgrel = 3
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -73,7 +73,9 @@ pkgname = jre-openjdk-headless-xdg
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-2
+	provides = jre21-openjdk-headless=21.u35-3
+	conflicts = jdk-openjdk
+	conflicts = jre-openjdk
 	backup = etc/java-openjdk-xdg/logging.properties
 	backup = etc/java-openjdk-xdg/management/jmxremote.access
 	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
@@ -92,7 +94,20 @@ pkgname = jre-openjdk-headless-xdg
 pkgname = jre-openjdk-xdg
 	pkgdesc = OpenJDK Java 21 full runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk.sh
-	depends = jre21-openjdk-headless=21.u35-2
+	depends = java-runtime-common>=3
+	depends = ca-certificates-utils
+	depends = nss
+	depends = libjpeg-turbo
+	depends = libjpeg.so
+	depends = lcms2
+	depends = liblcms2.so
+	depends = libnet
+	depends = freetype2
+	depends = libfreetype.so
+	depends = harfbuzz
+	depends = libharfbuzz.so
+	depends = glibc
+	depends = gcc-libs
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -103,12 +118,44 @@ pkgname = jre-openjdk-xdg
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-2
+	provides = jre21-openjdk=21.u35-3
+	provides = java-runtime-headless=21
+	provides = java-runtime-headless-openjdk=21
+	provides = jre21-openjdk-headless=21.u35-3
+	conflicts = jdk-openjdk
+	conflicts = jre-openjdk-headless
+	backup = etc/java-openjdk-xdg/logging.properties
+	backup = etc/java-openjdk-xdg/management/jmxremote.access
+	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
+	backup = etc/java-openjdk-xdg/management/management.properties
+	backup = etc/java-openjdk-xdg/net.properties
+	backup = etc/java-openjdk-xdg/security/java.policy
+	backup = etc/java-openjdk-xdg/security/java.security
+	backup = etc/java-openjdk-xdg/security/policy/README.txt
+	backup = etc/java-openjdk-xdg/security/policy/limited/default_US_export.policy
+	backup = etc/java-openjdk-xdg/security/policy/limited/default_local.policy
+	backup = etc/java-openjdk-xdg/security/policy/limited/exempt_local.policy
+	backup = etc/java-openjdk-xdg/security/policy/unlimited/default_US_export.policy
+	backup = etc/java-openjdk-xdg/security/policy/unlimited/default_local.policy
+	backup = etc/java-openjdk-xdg/sound.properties
 
 pkgname = jdk-openjdk-xdg
 	pkgdesc = OpenJDK Java 21 development kit - with improved Support for the XDG Base Directory Specification
 	install = install_jdk-openjdk.sh
-	depends = jre21-openjdk=21.u35-2
+	depends = java-runtime-common>=3
+	depends = ca-certificates-utils
+	depends = nss
+	depends = libjpeg-turbo
+	depends = libjpeg.so
+	depends = lcms2
+	depends = liblcms2.so
+	depends = libnet
+	depends = freetype2
+	depends = libfreetype.so
+	depends = harfbuzz
+	depends = libharfbuzz.so
+	depends = glibc
+	depends = gcc-libs
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
@@ -133,21 +180,15 @@ pkgname = jdk-openjdk-xdg
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-environment=21
 	provides = java-environment-openjdk=21
-	provides = jdk21-openjdk=21.u35-2
+	provides = jdk21-openjdk=21.u35-3
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-2
+	provides = jre21-openjdk=21.u35-3
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-2
+	provides = jre21-openjdk-headless=21.u35-3
 	conflicts = jre-openjdk
 	conflicts = jre-openjdk-headless
-	conflicts = java-runtime=21
-	conflicts = java-runtime-openjdk=21
-	conflicts = jre21-openjdk=21.u35-2
-	conflicts = java-runtime-headless=21
-	conflicts = java-runtime-headless-openjdk=21
-	conflicts = jre21-openjdk-headless=21.u35-2
 	backup = etc/java-openjdk-xdg/logging.properties
 	backup = etc/java-openjdk-xdg/management/jmxremote.access
 	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
@@ -165,10 +206,10 @@ pkgname = jdk-openjdk-xdg
 
 pkgname = openjdk-src-xdg
 	pkgdesc = OpenJDK Java 21 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk21-openjdk=21.u35-2
-	provides = openjdk21-src=21.u35-2
+	depends = jdk21-openjdk=21.u35-3
+	provides = openjdk21-src=21.u35-3
 
 pkgname = openjdk-doc-xdg
 	pkgdesc = OpenJDK Java 21 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk21-openjdk=21.u35-2
-	provides = openjdk21-doc=21.u35-2
+	depends = jdk21-openjdk=21.u35-3
+	provides = openjdk21-doc=21.u35-3

PKGBUILD

@@ -12,7 +12,7 @@ _securityver=0
 _updatever=35
 # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 pkgver=${_majorver}.u${_updatever}
-pkgrel=2
+pkgrel=3
 # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 _git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
@@ -52,6 +52,10 @@ _nonheadless=(lib/libawt_xawt.so
               lib/libjsound.so
               lib/libsplashscreen.so)
 
+_commondeps=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
+           'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz' 'libharfbuzz.so'
+           'glibc' 'gcc-libs')
+
 prepare() {
   cd ${_jdkdir}
   patch -p1 -i ../xdg-basedir-compliant-fontconfig.patch
@@ -133,11 +137,10 @@ check() {
 
 package_jre-openjdk-headless-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} headless runtime environment - with improved Support for the XDG Base Directory Specification"
-  depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
-           'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz' 'libharfbuzz.so'
-           'glibc' 'gcc-libs')
+  depends=("${_commondeps[@]}")
   optdepends=('java-rhino: for some JavaScript support')
   provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  conflicts=("jdk-openjdk" "jre-openjdk")
   backup=(etc/${pkgbase}/logging.properties
           etc/${pkgbase}/management/jmxremote.access
           etc/${pkgbase}/management/jmxremote.password.template
@@ -191,12 +194,28 @@ package_jre-openjdk-headless-xdg() {
 
 package_jre-openjdk-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} full runtime environment - with improved Support for the XDG Base Directory Specification"
-  depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib' 'libgif.so'
-           'glibc' 'gcc-libs' 'libpng')
+  depends=("${_commondeps[@]}" 'giflib' 'libgif.so' 'glibc' 'gcc-libs' 'libpng')
   optdepends=('alsa-lib: for basic sound support'
               'gtk2: for the Gtk+ 2 look and feel - desktop usage'
               'gtk3: for the Gtk+ 3 look and feel - desktop usage')
-  provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
+            "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  conflicts=("jdk-openjdk" "jre-openjdk-headless")
+  backup=(etc/${pkgbase}/logging.properties
+          etc/${pkgbase}/management/jmxremote.access
+          etc/${pkgbase}/management/jmxremote.password.template
+          etc/${pkgbase}/management/management.properties
+          etc/${pkgbase}/net.properties
+          etc/${pkgbase}/security/java.policy
+          etc/${pkgbase}/security/java.security
+          etc/${pkgbase}/security/policy/README.txt
+          etc/${pkgbase}/security/policy/limited/default_US_export.policy
+          etc/${pkgbase}/security/policy/limited/default_local.policy
+          etc/${pkgbase}/security/policy/limited/exempt_local.policy
+          etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
+          etc/${pkgbase}/security/policy/unlimited/default_local.policy
+          etc/${pkgbase}/sound.properties)
+
   install=install_jre-openjdk.sh
 
   cd ${_imgdir}/jre
@@ -237,7 +256,7 @@ package_jre-openjdk-xdg() {
 
 package_jdk-openjdk-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} development kit - with improved Support for the XDG Base Directory Specification"
-  depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3'
+  depends=("${_commondeps[@]}" 'java-environment-common=3'
            'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs' 'libgif.so' 'libpng'
            'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
            'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
@@ -249,9 +268,7 @@ package_jdk-openjdk-xdg() {
   provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}"
             "java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
             "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
-  conflicts=("jre-openjdk" "jre-openjdk-headless"
-             "java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
-             "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  conflicts=("jre-openjdk" "jre-openjdk-headless")
   backup=(etc/${pkgbase}/logging.properties
           etc/${pkgbase}/management/jmxremote.access
           etc/${pkgbase}/management/jmxremote.password.template