[packages/openjdk18] zero jvm uses "zero" directory now instead of "server"

[atler]

commit d74a744795ecda94bf1ba0ad5eb09f786e4a4d72
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Sep 20 13:57:39 2023 +0200

    zero jvm uses "zero" directory now instead of "server"

 openjdk18.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/openjdk18.spec b/openjdk18.spec
index 801f61f..f32a7a5 100644
--- a/openjdk18.spec
+++ b/openjdk18.spec
@@ -103,6 +103,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		dstdir		%{_jvmdir}/%{dstreldir}
 %define		jvmjardir	%{_jvmjardir}/%{name}-%{version}
 
+%if %{with zero}
+%define		jvm_type	zero
+%else
+%define		jvm_type	server
+%endif
+
 # to break artificial subpackage dependency loops
 %define		_noautoreq	'libmawt.so' java\\\\(ClassDataVersion\\\\)
 
@@ -373,7 +379,7 @@ chmod a+x configure
 
 # disable-debug-symbols so openjdk debuginfo handling won't conflict with ours
 %configure \
-	%{?with_zero:--with-jvm-variants=zero} \
+	--with-jvm-variants=%{jvm_type} \
 	--with-boot-jdk="%{java_home}" \
 	--with-extra-cflags="%{rpmcppflags} %{rpmcflags}" \
 	--with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags}" \
@@ -446,7 +452,7 @@ rmdir $RPM_BUILD_ROOT%{dstdir}/man
 # replace duplicates with symlinks, link to %{_bindir}
 for path in $RPM_BUILD_ROOT%{dstdir}/bin/*; do
 	filename=$(basename $path)
-        ln -sf "%{dstdir}/bin/$filename" $RPM_BUILD_ROOT%{_bindir}
+	ln -sf "%{dstdir}/bin/$filename" $RPM_BUILD_ROOT%{_bindir}
 done
 
 # keep configuration in %{_sysconfdir} (not all *.properties go there)
@@ -577,12 +583,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dstdir}/lib/jfr
 %{dstdir}/lib/jfr/*.jfc
 %{dstdir}/lib/security
-%dir %{dstdir}/lib/server
-%attr(755,root,root) %{dstdir}/lib/server/*.so
+%dir %{dstdir}/lib/%{jvm_type}
+%attr(755,root,root) %{dstdir}/lib/%{jvm_type}/*.so
 %if %{without zero}
-%{dstdir}/lib/server/classes.jsa
+%{dstdir}/lib/%{jvm_type}/classes.jsa
 %ifarch aarch64 %{x8664}
-%{dstdir}/lib/server/classes_nocoops.jsa
+%{dstdir}/lib/%{jvm_type}/classes_nocoops.jsa
 %endif
 %{dstdir}/lib/classlist
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openjdk18.git/commitdiff/d74a744795ecda94bf1ba0ad5eb09f786e4a4d72