fix conflicts with other jdk temurin versions

This commit is contained in:
faaris 2023-04-28 22:56:38 +01:00
parent 94ff774003
commit d877627969
2 changed files with 34 additions and 35 deletions

View File

@ -29,23 +29,22 @@ pkgbase = jdk18-temurin
provides = jdk-openjdk=18.0.2.1.u1 provides = jdk-openjdk=18.0.2.1.u1
provides = openjdk18-src=18.0.2.1.u1 provides = openjdk18-src=18.0.2.1.u1
provides = openjdk-src=18.0.2.1.u1 provides = openjdk-src=18.0.2.1.u1
replaces = jdk-adoptopenjdk
options = !strip options = !strip
backup = etc/java-temurin/logging.properties backup = etc/java-18-temurin/logging.properties
backup = etc/java-temurin/management/jmxremote.access backup = etc/java-18-temurin/management/jmxremote.access
backup = etc/java-temurin/management/jmxremote.password.template backup = etc/java-18-temurin/management/jmxremote.password.template
backup = etc/java-temurin/management/management.properties backup = etc/java-18-temurin/management/management.properties
backup = etc/java-temurin/net.properties backup = etc/java-18-temurin/net.properties
backup = etc/java-temurin/sdp/sdp.conf.template backup = etc/java-18-temurin/sdp/sdp.conf.template
backup = etc/java-temurin/security/java.policy backup = etc/java-18-temurin/security/java.policy
backup = etc/java-temurin/security/java.security backup = etc/java-18-temurin/security/java.security
backup = etc/java-temurin/security/policy/limited/default_local.policy backup = etc/java-18-temurin/security/policy/limited/default_local.policy
backup = etc/java-temurin/security/policy/limited/default_US_export.policy backup = etc/java-18-temurin/security/policy/limited/default_US_export.policy
backup = etc/java-temurin/security/policy/limited/exempt_local.policy backup = etc/java-18-temurin/security/policy/limited/exempt_local.policy
backup = etc/java-temurin/security/policy/README.txt backup = etc/java-18-temurin/security/policy/README.txt
backup = etc/java-temurin/security/policy/unlimited/default_local.policy backup = etc/java-18-temurin/security/policy/unlimited/default_local.policy
backup = etc/java-temurin/security/policy/unlimited/default_US_export.policy backup = etc/java-18-temurin/security/policy/unlimited/default_US_export.policy
backup = etc/java-temurin/sound.properties 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 = 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-java.desktop
source = freedesktop-jconsole.desktop source = freedesktop-jconsole.desktop

View File

@ -10,7 +10,7 @@
_majorver=18 _majorver=18
_completever=18.0.2.1 _completever=18.0.2.1
_updatever=1 _updatever=1
pkgrel=1 pkgrel=2
pkgver=${_completever}.u${_updatever} pkgver=${_completever}.u${_updatever}
_tag_ver=${_completever}+${_updatever} _tag_ver=${_completever}+${_updatever}
_versuffix=U _versuffix=U
@ -38,22 +38,21 @@ provides=("java-runtime-headless=${_majorver}"
"jdk-openjdk=${pkgver}" "jdk-openjdk=${pkgver}"
"openjdk${_majorver}-src=${pkgver}" "openjdk${_majorver}-src=${pkgver}"
"openjdk-src=${pkgver}") "openjdk-src=${pkgver}")
replaces=("jdk-adoptopenjdk") backup=(etc/java-${_majorver}-temurin/logging.properties
backup=(etc/java-temurin/logging.properties etc/java-${_majorver}-temurin/management/jmxremote.access
etc/java-temurin/management/jmxremote.access etc/java-${_majorver}-temurin/management/jmxremote.password.template
etc/java-temurin/management/jmxremote.password.template etc/java-${_majorver}-temurin/management/management.properties
etc/java-temurin/management/management.properties etc/java-${_majorver}-temurin/net.properties
etc/java-temurin/net.properties etc/java-${_majorver}-temurin/sdp/sdp.conf.template
etc/java-temurin/sdp/sdp.conf.template etc/java-${_majorver}-temurin/security/java.policy
etc/java-temurin/security/java.policy etc/java-${_majorver}-temurin/security/java.security
etc/java-temurin/security/java.security etc/java-${_majorver}-temurin/security/policy/limited/default_local.policy
etc/java-temurin/security/policy/limited/default_local.policy etc/java-${_majorver}-temurin/security/policy/limited/default_US_export.policy
etc/java-temurin/security/policy/limited/default_US_export.policy etc/java-${_majorver}-temurin/security/policy/limited/exempt_local.policy
etc/java-temurin/security/policy/limited/exempt_local.policy etc/java-${_majorver}-temurin/security/policy/README.txt
etc/java-temurin/security/policy/README.txt etc/java-${_majorver}-temurin/security/policy/unlimited/default_local.policy
etc/java-temurin/security/policy/unlimited/default_local.policy etc/java-${_majorver}-temurin/security/policy/unlimited/default_US_export.policy
etc/java-temurin/security/policy/unlimited/default_US_export.policy etc/java-${_majorver}-temurin/sound.properties)
etc/java-temurin/sound.properties)
install=install_jdk18-temurin.sh install=install_jdk18-temurin.sh
options=(!strip) options=(!strip)
@ -78,8 +77,8 @@ package() {
# Conf # Conf
install -dm 755 "${pkgdir}/etc" install -dm 755 "${pkgdir}/etc"
mv conf "${pkgdir}/etc/java-temurin" mv conf "${pkgdir}/etc/java-${_majorver}-temurin"
ln -sf /etc/java-temurin conf ln -sf /etc/java-${_majorver}-temurin conf
# Legal # Legal
install -dm 755 "${pkgdir}/usr/share/licenses" install -dm 755 "${pkgdir}/usr/share/licenses"
@ -103,4 +102,5 @@ package() {
"${srcdir}/freedesktop-${f}.desktop" \ "${srcdir}/freedesktop-${f}.desktop" \
"${pkgdir}/usr/share/applications/${f}-${pkgname}.desktop" "${pkgdir}/usr/share/applications/${f}-${pkgname}.desktop"
done done
} }