Leonidas Spyropoulos pushed to branch main at Arch Linux / Packaging / Packages / java-openjdk
Commits: d1dd1a2f by Leonidas Spyropoulos at 2023-10-09T11:08:09+01:00 Add conflicts to jre, fix backups and common depends Signed-off-by: Leonidas Spyropoulos <[email protected]> - - - - - 1 changed file: - PKGBUILD Changes: ===================================== PKGBUILD ===================================== @@ -13,7 +13,7 @@ _securityver=0 _updatever=35 # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} pkgver=${_majorver}.u${_updatever} -pkgrel=4 +pkgrel=5 # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} _git_tag=jdk-${_majorver}+${_updatever} arch=('x86_64') @@ -47,6 +47,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') + build() { cd ${_jdkdir} @@ -122,9 +126,7 @@ check() { package_jre-openjdk-headless() { pkgdesc="OpenJDK Java ${_majorver} headless runtime environment" - 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}") backup=(etc/${pkgbase}/logging.properties @@ -180,12 +182,27 @@ package_jre-openjdk-headless() { package_jre-openjdk() { pkgdesc="OpenJDK Java ${_majorver} full runtime environment" - 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=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}") + 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 @@ -225,7 +242,7 @@ package_jre-openjdk() { package_jdk-openjdk() { pkgdesc="OpenJDK Java ${_majorver} development kit" - 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' View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/java-openjdk/-/commit/d1dd1a2f0d205de2cc4b8167fbb5cfab57e64a40 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/java-openjdk/-/commit/d1dd1a2f0d205de2cc4b8167fbb5cfab57e64a40 You're receiving this email because of your account on gitlab.archlinux.org.
