Skip to content
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.

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

tools: Fix RPM weak dependencies #13604

Merged
merged 1 commit into from Feb 24, 2020

Conversation

martinpitt
Copy link
Member

cockpit-{packagekit,storaged,pcp} are meant to be recommended/suggested
on RHEL as well, but were accidentally inside the "not RHEL"
conditional. The other packages don't exist in RHEL or are merged into
cockpit-system, so the conditional is still correct for them.

Also add a Recommends: PackageKit to cockpit-system for minimal
installations, so that the on-demand installation for further packages
(e. g. insights-client for Subscriptions, or realmd for IdM) works.

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

cockpit-{packagekit,storaged,pcp} are meant to be recommended/suggested
on RHEL as well, but were accidentally inside the "not RHEL"
conditional.  The other packages don't exist in RHEL or are merged into
cockpit-system, so the conditional is still correct for them.

Also add a Recommends: PackageKit to cockpit-system for minimal
installations, so that the on-demand installation for further packages
(e. g. insights-client for Subscriptions, or realmd for IdM) works.

https://bugzilla.redhat.com/show_bug.cgi?id=1803858
Recommends: (cockpit-storaged if udisks2)
Recommends: cockpit-packagekit
Suggests: cockpit-pcp

%if 0%{?rhel} == 0
Recommends: cockpit-dashboard
%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
Recommends: (cockpit-docker if /usr/bin/docker)
%endif
Copy link
Member

Choose a reason for hiding this comment

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

heh, I was looking at it for a bit until I realized that this endif is connected with ifarch :)

Copy link
Member

@marusak marusak left a comment

Choose a reason for hiding this comment

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

Thanks!

@martinpitt martinpitt merged commit f0cc35f into cockpit-project:master Feb 24, 2020
@martinpitt martinpitt deleted the r8-weakdeps branch February 24, 2020 15:39
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.

None yet

2 participants