From c6bb82f92bf6a768c6eef8c57644478dc402a86e Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Fri, 7 Aug 2026 10:09:01 +0200 Subject: [PATCH 1/2] Fix of pcp-atop conflict with atop on Fedora Make pcp-atop as optional dependency on RPM based distributions to allow users with installed atop to update PCP while keeping the already installed atop. --- build/rpm/pcp.spec.in | 4 +--- build/rpm/redhat.spec | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in index 1850c606da..f96948b607 100755 --- a/build/rpm/pcp.spec.in +++ b/build/rpm/pcp.spec.in @@ -794,7 +794,7 @@ License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) System and Monitoring Tools URL: https://pcp.io Requires: pcp = @package_version@ pcp-libs = @package_version@ -Requires: pcp-atop = @package_version@ +Recommends: pcp-atop = @package_version@ Requires: pcp-htop = @package_version@ Obsoletes: pcp-system-tools-debuginfo < @package_version@ %if "@have_python@" == "true" @@ -814,8 +814,6 @@ License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) top-like system and process monitor URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} -Provides: atop = @package_version@ -Obsoletes: atop <= 2.12 Conflicts: atop %description atop diff --git a/build/rpm/redhat.spec b/build/rpm/redhat.spec index 1c4ccba731..48775f0999 100644 --- a/build/rpm/redhat.spec +++ b/build/rpm/redhat.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 7.2.1 -Release: 1%{?dist} +Version: 7.2.0 +Release: 2%{?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 @@ -2163,7 +2163,7 @@ License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) System and Monitoring Tools URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -Requires: pcp-atop = %{version}-%{release} +Recommends: pcp-atop = %{version}-%{release} Requires: pcp-htop = %{version}-%{release} Obsoletes: pcp-system-tools-debuginfo < %{version}-%{release} %if !%{disable_python3} @@ -2183,8 +2183,6 @@ License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) top-like system and process monitor URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} -Provides: atop = %{version}-%{release} -Obsoletes: atop <= 2.12 Conflicts: atop %description atop @@ -3549,5 +3547,5 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog -* Wed Sep 30 2026 Lauren Chilton - 7.2.1-1 -- Latest release. +* Wed Aug 07 2026 Jan Kurik - 7.2.0-2 +- Fixed pcp-atop conflict with atop From eb1b1b4572046e5c6098c6fc38c53c9eda6a653f Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Fri, 7 Aug 2026 10:25:55 +0200 Subject: [PATCH 2/2] Fixed date in the changelog --- build/rpm/redhat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/rpm/redhat.spec b/build/rpm/redhat.spec index 48775f0999..4d922b5aa6 100644 --- a/build/rpm/redhat.spec +++ b/build/rpm/redhat.spec @@ -3547,5 +3547,5 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog -* Wed Aug 07 2026 Jan Kurik - 7.2.0-2 +* Fri Aug 07 2026 Jan Kurik - 7.2.0-2 - Fixed pcp-atop conflict with atop