diff --git a/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz b/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz deleted file mode 100644 index 896dce1cf72940b0bf4ffe2abe329216d335eedc..0000000000000000000000000000000000000000 Binary files a/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz and /dev/null differ diff --git a/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz b/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz deleted file mode 100644 index ffd60eaaa73c14b209fee3386efedef6c45001be..0000000000000000000000000000000000000000 Binary files a/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz and /dev/null differ diff --git a/openjdk-21.spec b/openjdk-21.spec index 38a0463212157e9a44ba74a116c24e03288d48e2..76a05fed0b7a994c6eb0b57f8aa3b595f88ccd60 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -897,7 +897,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 1 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages @@ -933,8 +933,6 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz -Source1: OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz -Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1330,22 +1328,6 @@ fi ARCH=$(uname -m) BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk -if [ "$ARCH" = "x86_64" ]; then - tar -xf %{SOURCE2} - BOOTJDKPATH=$PWD/jdk-20.0.2+9 -elif [ "$ARCH" = "aarch64" ]; then - tar -xf %{SOURCE1} - BOOTJDKPATH=$PWD/jdk-20.0.2+9 -elif [ "$ARCH" = "riscv64" ]; then - : -elif [ "$ARCH" = "loongarch64" ]; then - : -elif [ "$ARCH" = "ppc64le" ]; then - : -else - echo " Failed to set BOOTJDKPATH " - exit 18 -fi echo $BOOTJDKPATH @@ -1793,6 +1775,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Mon Jul 29 2024 zhaosaisai - 1:21.0.4.7-2 +- change boot jdk to itself + * Thu Aug 1 2024 aoqi - 1:21.0.4.7-1 - update LoongArch64 port to 21.0.4