-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
podman.spec: recommend slirp4netns #1271
Conversation
@rhatdan PTAL. I picked up the low hanging fruit from #1234 (comment). As slirp4netns is already packaged for Fedora, I assume the change is okay. |
contrib/spec/podman.spec.in
Outdated
@@ -69,6 +69,7 @@ Recommends: container-selinux | |||
%else | |||
Requires: container-selinux | |||
%endif | |||
Recommends: slirp4netns |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you put this into the same block above. So on RHEL it Requires else it recommends.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't exist in RHEL, so it should just be conditioned for "not-RHEL", since Fedora, SLE, openSUSE, and others all support weak dependencies.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well it will exist in RHEL8. But I am fine with just moving it up with the ifdef block.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved the line in the if branch, so it'll affect Fedora. Once it's packaged in RHEL, it can be added to the else branch.
thanks for working on this. LGTM |
235ae8a
to
6b493ee
Compare
Does SUSE support Recommends yet? |
It does but we're not using this .spec for packaging. |
Perhaps as a separate PR, we should consider enhancing the packaging so that it can be tested in COPR against Fedora, EL7, openSUSE Leap 15.0, and openSUSE Tumbleweed. |
Yes that was what I was thinking. The goal of the spec, I believe it to allow random people to use it for their distribution. We don't use this spec for Fedora or RHEL or Centos, but we use something close to it. (I wish it was closer.) |
THis should be
|
I'd flip it to the following: %if 0%{?rhel} && 0%{?rhel} < 8
Requires: container-selinux
Requires: slirp4netns
%else
Recommends: container-selinux
Recommends: slirp4netns
%endif |
I agree, the rhel will handle centos as well. |
Fixes: containers#1234 Signed-off-by: Valentin Rothberg <[email protected]>
6b493ee
to
7855d0a
Compare
Updated, thanks! |
bot, retest this please |
@rh-atomic-bot retry |
I am just going to merge since this passes all tests and Humu seems to not like it. |
Fixes: #1234
Signed-off-by: Valentin Rothberg [email protected]