From 5575399c13dcb0e96246f2b10d03bd03723c1cd3 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Sat, 14 Oct 2023 23:29:55 +0100
Subject: [PATCH] Movement of jcmd should happen for both portable and
 non-portable builds

- Related: RHEL-13585
---
 java-1.8.0-openjdk.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index b81e356..72c6fc1 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -2219,9 +2219,6 @@ function installjdk() {
         cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
         popd
 
-        # Move jcmd into the jre image (RHEL-12344)
-        mv ${imagepath}/bin/jcmd ${imagepath}/jre/bin
-
         # Print release information
         cat ${imagepath}/release
 
@@ -2256,6 +2253,9 @@ function customisejdk() {
         mv ${imagepath}/jre/lib/security/cacerts{,.upstream}
         # Install cacerts symlink needed by some apps which hard-code the path
         ln -sv %{cacerts_file} ${imagepath}/jre/lib/security
+
+        # Move jcmd into the jre image (RHEL-12344)
+        mv ${imagepath}/bin/jcmd ${imagepath}/jre/bin
     fi
 }