diff options
| author | Daniel Bermond | 2024-03-19 20:02:35 -0300 |
|---|---|---|
| committer | Daniel Bermond | 2024-03-19 20:02:35 -0300 |
| commit | c679eedec36049d803103f143db881ead37e085e (patch) | |
| tree | 56d994575bf9f0db02a0d43718a6fe81c54ed1ad | |
| parent | c037089bb86ec43438ae5f4d9920c71b69226a9a (diff) | |
| download | aur-jdk.tar.gz | |
Add missing jre files in jdk
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 8 insertions, 18 deletions
@@ -1,7 +1,7 @@ pkgbase = jdk pkgdesc = Oracle Java pkgver = 22 - pkgrel = 1 + pkgrel = 2 url = https://www.oracle.com/java/ arch = x86_64 license = LicenseRef-custom @@ -42,10 +42,10 @@ pkgname = jre optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage provides = java-runtime=22 provides = java-runtime-jdk22 - provides = jre22-jdk=22-1 + provides = jre22-jdk=22-2 provides = java-runtime-headless=22 provides = java-runtime-headless-jdk=22 - provides = jre22-jdk-headless=22-1 + provides = jre22-jdk-headless=22-2 conflicts = jdk backup = etc/java-jdk/management/jmxremote.access backup = etc/java-jdk/management/jmxremote.password.template @@ -81,14 +81,14 @@ pkgname = jdk optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage provides = java-environment=22 provides = java-environment-jdk=22 - provides = jdk22-jdk=22-1 + provides = jdk22-jdk=22-2 provides = jre provides = java-runtime=22 provides = java-runtime-jdk22 - provides = jre22-jdk=22-1 + provides = jre22-jdk=22-2 provides = java-runtime-headless=22 provides = java-runtime-headless-jdk=22 - provides = jre22-jdk-headless=22-1 + provides = jre22-jdk-headless=22-2 conflicts = jre backup = etc/java-jdk/management/jmxremote.access backup = etc/java-jdk/management/jmxremote.password.template @@ -7,7 +7,7 @@ pkgver=22 _build=36 _hash=830ec9fcccef480bb3e73fb7ecafe059 _majver="${pkgver%%.*}" -pkgrel=1 +pkgrel=2 pkgdesc='Oracle Java' arch=('x86_64') url='https://www.oracle.com/java/' @@ -132,12 +132,8 @@ package_jdk() { cd "${srcdir}/jdk-${pkgver}" local _jvmdir="/usr/lib/jvm/java-${_majver}-${pkgname}" - install -d -m755 "${pkgdir}/${_jvmdir}" - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - # bin - cp -a bin "${pkgdir}/${_jvmdir}" - rm "${pkgdir}/${_jvmdir}/bin/"{java,jfr,jrunscript,keytool,rmiregistry,jwebserver} + install -D -m755 bin/* -t "${pkgdir}/${_jvmdir}/bin" # libs install -D -m644 lib/ct.sym -t "${pkgdir}/${_jvmdir}/lib" @@ -162,12 +158,6 @@ package_jdk() { do install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1" done < <(find man/man1 -type f -print0) - rm "${pkgdir}/usr/share/man/man1/"{java,jfr,jrunscript,keytool,rmiregistry}-jdk"${_majver}".1 - - # legal/licenses - cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}" - ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java-${pkgname}" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}" } package_jdk-doc() { |