build: spec dependency on ps, java bytecode update
Resolves: RHEL-39491 Resolves: RHEL-40718
This commit is contained in:
parent
a36bb1932a
commit
de25986db0
14
pcp.spec
14
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)
|
||||
|
BIN
redhat-issues-RHEL-40718-java-bytecode-update.patch
Normal file
BIN
redhat-issues-RHEL-40718-java-bytecode-update.patch
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user