Skip to content

Fix of pcp-atop conflict with atop on Fedora #2685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
natoscott merged 2 commits into from
Aug 9, 2026
+6 −10
Merged

Fix of pcp-atop conflict with atop on Fedora #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6bb82f
Fix of pcp-atop conflict with atop on Fedora
kurik Aug 7, 2026
eb1b1b4
Fixed date in the changelog
kurik Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build/rpm/pcp.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
12 changes: 5 additions & 7 deletions build/rpm/redhat.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: pcp
Version: 7.2.1
Release: 1%{?dist}
Version: 7.2.0
Release: 2%{?dist}
Comment thread
kurik marked this conversation as resolved.
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
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -3549,5 +3547,5 @@ fi
%files zeroconf -f pcp-zeroconf-files.rpm

%changelog
* Wed Sep 30 2026 Lauren Chilton <lchilton@redhat.com> - 7.2.1-1
- Latest release.
* Fri Aug 07 2026 Jan Kurik <jkurik@redhat.com> - 7.2.0-2
- Fixed pcp-atop conflict with atop
Loading