Skip to content

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

Merged
natoscott merged 2 commits into
performancecopilot:mainfrom
kurik:atop
Aug 9, 2026
Merged

Fix of pcp-atop conflict with atop on Fedora#2685
natoscott merged 2 commits into
performancecopilot:mainfrom
kurik:atop

Conversation

@kurik

@kurik kurik commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

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.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2510602

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.
@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: df9277fe-1c8d-4f8a-8539-a6663db6243b

📥 Commits

Reviewing files that changed from the base of the PR and between c6bb82f and eb1b1b4.

📒 Files selected for processing (1)
  • build/rpm/redhat.spec
🚧 Files skipped from review as they are similar to previous changes (1)
  • build/rpm/redhat.spec

📝 Walkthrough

Summary by CodeRabbit

  • Bug Fixes
    • Improved compatibility between pcp-atop and the standalone atop package.
    • Changed pcp-atop from a mandatory dependency to a recommended package for system tools.
    • Removed outdated package compatibility declarations.

Walkthrough

The RPM specifications now recommend pcp-atop instead of requiring it. They remove atop compatibility declarations, retain the conflict declaration, and update the Red Hat package release metadata and changelog.

Changes

RPM package relationship update

Layer / File(s) Summary
Package relationships and release metadata
build/rpm/pcp.spec.in, build/rpm/redhat.spec
Both specifications recommend pcp-atop for pcp-system-tools. They remove Provides: atop and Obsoletes: atop from pcp-atop while retaining Conflicts: atop. The Red Hat specification updates the release version and changelog entry.

Possibly related PRs

Poem

A rabbit checks the package trail,
pcp-atop recommendations prevail.
Compatibility tags now depart,
Conflicts remain as part of the chart.
Release notes record the change.

🚥 Pre-merge checks | ✅ 4
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly describes the fix to the pcp-atop conflict with the atop package on Fedora.
Description check ✅ Passed The description explains that pcp-atop becomes optional so users with atop installed can update PCP without removing atop.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@build/rpm/redhat.spec`:
- Line 3550: Update the changelog entry dated Aug 07 2026 to use the correct
weekday `Fri` instead of `Wed`, leaving the version, author, and other entry
details unchanged.
- Around line 2-3: Restore the RPM EVR in the spec metadata by keeping Version
at 7.2.1 and incrementing Release from the previously published value, unless
publication of 7.2.1-1 is verified not to have occurred. Do not use Version
7.2.0 with Release 2, since it lowers the package EVR.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: f116578a-c8bb-4bb4-a7c3-a1f5505ff166

📥 Commits

Reviewing files that changed from the base of the PR and between 918d12b and c6bb82f.

📒 Files selected for processing (2)
  • build/rpm/pcp.spec.in
  • build/rpm/redhat.spec

Comment thread build/rpm/redhat.spec
Comment thread build/rpm/redhat.spec Outdated
@natoscott
natoscott merged commit 9df751f into performancecopilot:main Aug 9, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants