From de25986db06e800b1c4f7caeb20972ee07041026 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Thu, 1 Aug 2024 11:31:55 +1000
Subject: [PATCH] build: spec dependency on ps, java bytecode update

Resolves: RHEL-39491
Resolves: RHEL-40718
---
 pcp.spec                                         |  14 +++++++++++---
 ...-issues-RHEL-40718-java-bytecode-update.patch | Bin 0 -> 3401 bytes
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 redhat-issues-RHEL-40718-java-bytecode-update.patch

diff --git a/pcp.spec b/pcp.spec
index 6fbc276..99f84ec 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 6.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0
 URL:     https://pcp.io
@@ -12,6 +12,7 @@ Patch1: redhat-issues-RHEL-2317-default-archive-version.patch
 Patch2: redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch
 Patch3: revert-time64_t-i386.patch
 Patch4: redhat-issues-39159-39132-32983-39293.patch
+Patch5: redhat-issues-RHEL-40718-java-bytecode-update.patch 
 
 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 ExcludeArch: %{ix86}
@@ -27,11 +28,13 @@ ExcludeArch: %{ix86}
 %global __python2 python
 %endif
 
-# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname"
+# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname".  Likewise for /bin/ps from procps[-ng] packages.
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 17
 %global _hostname_executable /usr/bin/hostname
+%global _ps_executable /usr/bin/ps
 %else
 %global _hostname_executable /bin/hostname
+%global _ps_executable /bin/ps
 %endif
 
 %global disable_perl 0
@@ -301,6 +304,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) perl(JSON)
 BuildRequires: perl(Time::HiRes) perl(Digest::MD5)
 BuildRequires: perl(XML::LibXML) perl(File::Slurp)
 BuildRequires: %{_hostname_executable}
+BuildRequires: %{_ps_executable}
 %if !%{disable_systemd}
 BuildRequires: systemd-devel
 %endif
@@ -317,7 +321,7 @@ BuildRequires: qt5-qtsvg-devel
 
 # Utilities used indirectly e.g. by scripts we install
 Requires: bash xz gawk sed grep coreutils diffutils findutils
-Requires: which %{_hostname_executable}
+Requires: which %{_hostname_executable} %{_ps_executable}
 Requires: pcp-libs = %{version}-%{release}
 
 %if !%{disable_selinux}
@@ -3539,6 +3543,10 @@ fi
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Thu Aug 1 2024 Nathan Scott <nathans@redhat.com> - 6.2.2-5
+- Add rpm dependency on package providing ps(1) tool (RHEL-39491)
+- Update Java bytecode in pcp-testasuite package (RHEL-40718)
+
 * Sun Jul 7 2024 Lauren Chilton <lchilton@redhat.com> - 6.2.2-4
 - Removed excess headers for pcp2openmetrics tool (RHEL-39159)
 - Fix pcp2openmetrics '-s' option (RHEL-39132)
diff --git a/redhat-issues-RHEL-40718-java-bytecode-update.patch b/redhat-issues-RHEL-40718-java-bytecode-update.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e28188654249d91a3bc53823427a3571621baefa
GIT binary patch
literal 3401
zcmcImTT|Oc6h86=VIeT#ns8liiNOd<#s=(=44o#OKna}zk`8TOWLXYQZOM`4G=1z$
ze@9<=&P*GaW~M)&Z~X~<?0@K#ek+;SCdMJtsf`!y**#}>&-d+jWZ30$(PcTkV5Bz+
z86%fc^BFarUQ6dQ`g&$Hl{N~=jrEN+HJ47NR;5pB?y>D;*`Dqm>lQmOY}aL*me;Fp
zIcEM?cUKI%d|!H?yJnU#_NAF;JGBzi)|sYeQ<<!qW=S=fVsTAXRY}4W_Cn9HS|tw;
z_FR9dGoz$et7erIY=@O?$3&Ai9gFSo!QA(*X`s(unohN7TV4dO**B|p=_UO3vF0P)
zWyNZ>X0rW94|kQ6x~^?VQodLyFlA4#ITcnhD$3eQ5?|XXK1;mN6MXT+p;>jGSVbIz
z@1im5iV2dUD2+*-LPc=wRYlVjZ4KGTrnT&9W(7I$Kgb6XBE{qJMzkxI<bhI(x}m5V
zQ#0A*T2@<K$)u8*bZUJqSx@ZN7E`q44fN1#ZAr@S|NQzJ5v6EeQYb>B5$dL!VOaP_
zir0tl(VP^g00l(~$rPq8f%?6)lyvJ^;)~pK({Kgq+AJbN_XP^Z7N7D!5fLF|>LFR6
z?u!iKu~aOWZn10%By7K1i(vz|XiTJWJao~7NRuK>i8Ou5p=q5^Y<uykK%q|oyg<?2
zqGj&Y$~n_H)N>_Rf=<oycOy{mfvX$eKGrMV7*-KTQV#5zW0;>6`Q-j52M-Q+o<8RL
zT;Ye4sh0-4-HXIznxR>N1{<e-_{uOVE~qBc91XM_uuX0T8jkxl%kuZvH1F`(G4;Ga
z;cCe=D>zeZhaW9kaf+7fZT-;E4U-s8EAhRf3GmbcrvRRNsSj-wJ%xg>5cMvdlCU)1
zpFjSE0<U4f8PWD(7|<#d^1Nl3Z_q&9_c^S5cp<pCbo4U?z6#~x{1c7-C<sFoJfrZ*
z`CpHh-;j86{^x5r4Fa<Xz!mUfkKu{13Et~R*g<c6h~{YoPlN@7e^Wp>5@|?;^Ds;S
z8j-$Xdp5Jo?@9oW;f9)4p4kOf04|^%0*M@mK^khIUE7q2G}0a=1RAEBGPVoyUQVk=
zhqe%1k7BLl0y^=I%<@p=ppD_z3}P6$6lfA@X$PX{gE)oZI*9Qm5T}uQ-}e%Tq6eaQ
z0b=hNMe87rwtzT{t?<~LKx7zifH=%SoPjAovmHUahQK!8zN<9$y*Zs^_PxpfL228@
zx~AA_Tzi+bRIA*s;sQo#>_YwW=tgK<qzOEPX%g)eO?xd9X+}hT8(N(FSS@a>!uZ9X
z!!J@7`~{J2i*%<+RJnL}(9}>_FG5sDVqfnzB<;Y3Og+2H9b2yg4s;Ej#SND!MvLul
zu1rf@0Z>SmNs(!V5^ZJRU4fCI7%FcxnUZuvpq?i9T3jy**9SybpxfS2Yi_ZWFl@`H
zIgV+$315JAZ9^~Z>sH<_3nbRZ1X_wM`U(1=*Il?-<|}vGLJbYawzn6zx&C{lZ8X-D
z<%`1M<vCn+b;rf+>+?k4F9KY11&BF8Lr`4tKg^4OuNz!|xkL~&FhWC+Lx1WIAY2I6
zRB+Q%`M?>4PN<u!eAgL?q5k1F)P3(QMULKrJx3F#)N@Mmp7MrzPtN~9kT4{n4{gBH
z_*qmaqH**lVVlMngMAjgIjGt^X|#Z9@J>cP7ilzvAU9zO(5;R#5~m)KWL}s1T5!Cg
z67;v{6K+q`uP1FPfmbF*uqPQiy7hk}@2xg2L-i-$CxQR!bMe}QsZ%t=U%v1f;;{o3
z{LORIf<RX>#h-PD-!B~3XN^cpmv6<D?@%9i-#=XXW@r&O^A9h8c$GvON3RWGmtk%Y
zR>95pr(Pzkct(*rVQ-w#kVn`t5LSwVu~VF|?3Cs>VQ)7RmcOR(C9Xr*1m@N29ta!d
NgjHb*kk*l~{{r;M>>dCB

literal 0
HcmV?d00001