OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openjdk?expand=0&rev=9

java-17-openjdk.spec

@@ -35,10 +35,10 @@
 %global updatever       0
 %global patchver        0
 %global datever         2021-09-14
-%global buildver        19
+%global buildver        22
 %global openjdk_repo    jdk
-%global openjdk_tag     jdk-17+19
-%global openjdk_dir     jdk-jdk-17-19
+%global openjdk_tag     jdk-17+22
+%global openjdk_dir     jdk-jdk-17-22
 %global icedtea_sound_version 1.0.1
 # JavaEE modules
 %global java_atk_wrapper_version 0.33.2
@@ -117,12 +117,6 @@
 %global with_pulseaudio 1
 %bcond_with zero
 %if ! %{with zero}
-%ifarch x86_64 %{aarch64}
-%global _with_aot 1
-%endif
-%endif
-%bcond_with aot
-%if ! %{with zero}
 %global with_systemtap 1
 %else
 %global with_systemtap 0
@@ -328,9 +322,6 @@ BuildRequires:  pulseaudio >= 0.9.11
 %if %{with_system_pcsc}
 BuildRequires:  pcsc-lite-devel
 %endif
-%if %{with aot}
-BuildRequires:  libelf-devel
-%endif
 
 %description
 The OpenJDK %{featurever} runtime environment.
@@ -592,11 +583,6 @@ bash ../configure \
 %ifarch %{arm6}
     --with-jvm-variants=client \
 %endif
-%endif
-%if %{with aot}
-    --enable-aot \
-%else
-    --disable-aot \
 %endif
     --disable-keep-packaged-modules \
     --with-debug-level=%{debugbuild} \
@@ -1043,9 +1029,6 @@ ext=.gz
 update-alternatives \
   --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
   --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
-%if %{with aot}
-  --slave %{_bindir}/jaotc jaotc %{sdkbindir}/jaotc \
-%endif
   --slave %{_bindir}/jar jar %{sdkbindir}/jar \
   --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \
   --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
@@ -1072,10 +1055,6 @@ update-alternatives \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
   --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \
-%if %{with aot}
-  --slave %{_mandir}/man1/jaotc.1$ext jaotc.1$ext \
-  %{_mandir}/man1/jaotc-%{sdklnk}.1$ext \
-%endif
   --slave %{_mandir}/man1/jar.1$ext jar.1$ext \
   %{_mandir}/man1/jar-%{sdklnk}.1$ext \
   --slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \
@@ -1289,9 +1268,6 @@ fi
 %if %{with_systemtap}
 %dir %{_jvmdir}/%{sdkdir}/tapset
 %endif
-%if %{with aot}
-%{_jvmdir}/%{sdkdir}/bin/jaotc
-%endif
 %{_jvmdir}/%{sdkdir}/bin/jar
 %{_jvmdir}/%{sdkdir}/bin/jarsigner
 %{_jvmdir}/%{sdkdir}/bin/javac
@@ -1340,9 +1316,6 @@ fi
 %{_jvmdir}/%{sdkdir}/tapset/*.stp
 %endif
 %{_jvmdir}/%{sdklnk}
-%if %{with aot}
-%{_mandir}/man1/jaotc-%{sdklnk}.1%{?ext_man}
-%endif
 %{_mandir}/man1/jar-%{sdklnk}.1%{?ext_man}
 %{_mandir}/man1/jarsigner-%{sdklnk}.1%{?ext_man}
 %{_mandir}/man1/javac-%{sdklnk}.1%{?ext_man}

jdk-17+19.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68576e5836c9be0aa68d581650dcf2d15d92223a961e72e03cf6c957dbadbd8c
-size 105195510

jdk-17+22.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1ad749a8b689102a05fbb222d2560e6cc49f675df1715b921be5e3f7660c11b
+size 102597259

system-pcsclite.patch

@@ -53,7 +53,7 @@
 --- jdk15/make/autoconf/spec.gmk.in	2020-05-07 13:35:09.825368428 +0200
 +++ jdk15/make/autoconf/spec.gmk.in	2020-05-07 13:37:41.358280752 +0200
 @@ -769,6 +769,7 @@
- ENABLE_AOT:=@ENABLE_AOT@
+ # Build setup
  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
 +USE_EXTERNAL_LIBPCSCLITE:=@USE_EXTERNAL_LIBPCSCLITE@