From a265343430a6e5f1415094aa806b5efab971ae3f Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Mon, 16 Oct 2023 16:08:26 +0100
Subject: [PATCH] Revert jcmd move as jcmd will not operate without tools.jar

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

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 72c6fc1..b954ae7 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -351,7 +351,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      2
+%global rpmrelease      3
 # Settings used by the portable build
 %global portablerelease 1
 %global portablesuffix el8
@@ -524,7 +524,6 @@ alternatives \\
   --install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY  --family %{family} \\
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{?1}} \\
   --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
-  --slave %{_bindir}/jcmd jcmd %{jrebindir -- %{?1}}/jcmd \\
   --slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
   --slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
   --slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
@@ -539,8 +538,6 @@ alternatives \\
   %{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
   %{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
-  --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
-  %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
   %{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
@@ -644,6 +641,7 @@ alternatives \\
   --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
   --slave %{_bindir}/javah javah %{sdkbindir -- %{?1}}/javah \\
   --slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
+  --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
   --slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
   --slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
   --slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -684,6 +682,8 @@ alternatives \\
   %{_mandir}/man1/javah-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
   %{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
+  --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+  %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
   %{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -850,7 +850,6 @@ exit 0
 %dir %{_jvmdir}/%{jredir -- %{?1}}/lib
 %{_jvmdir}/%{jredir -- %{?1}}/bin/java
 %{_jvmdir}/%{jredir -- %{?1}}/bin/%{alt_java_name}
-%{_jvmdir}/%{jredir -- %{?1}}/bin/jcmd
 %{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
 %{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
 %{_jvmdir}/%{jredir -- %{?1}}/bin/orbd
@@ -883,7 +882,6 @@ exit 0
 %{_jvmdir}/%{jredir -- %{?1}}/lib/calendars.properties
 %{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
@@ -1009,7 +1007,6 @@ exit 0
 %ghost %{_bindir}/java
 %ghost %{_jvmdir}/jre
 %ghost %{_bindir}/%{alt_java_name}
-%ghost %{_bindir}/jcmd
 %ghost %{_bindir}/jjs
 %ghost %{_bindir}/keytool
 %ghost %{_bindir}/orbd
@@ -1048,6 +1045,7 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/javah
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/java-rmi.cgi
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
@@ -1107,6 +1105,7 @@ exit 0
 %{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/javah-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jdb-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jdeps-%{uniquesuffix -- %{?1}}.1*
@@ -1147,6 +1146,7 @@ exit 0
 %ghost %{_bindir}/javadoc
 %ghost %{_bindir}/javah
 %ghost %{_bindir}/javap
+%ghost %{_bindir}/jcmd
 %ghost %{_bindir}/jconsole
 %ghost %{_bindir}/jdb
 %ghost %{_bindir}/jdeps
@@ -2253,9 +2253,6 @@ 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
 }
 
@@ -2880,6 +2877,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Oct 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-3
+- Revert jcmd move as jcmd will not operate without tools.jar
+- Related: RHEL-13585
+
 * Tue Oct 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-2
 - Update to shenandoah-jdk8u392-b08 (GA)
 - Update release notes for shenandoah-8u392-b08.